2009-06-30 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Removed ServerHost. Same functionality is implemented using
	FileEntry's in-flight Request objects.
	* src/AbstractCommand.cc
	* src/BtDependency.cc
	* src/CreateRequestCommand.cc
	* src/FileEntry.cc
	* src/FileEntry.h
	* src/FtpNegotiationCommand.cc
	* src/HttpResponseCommand.cc
	* src/Makefile.am
	* src/Metalink2RequestGroup.cc
	* src/RequestGroup.cc
	* src/RequestGroup.h
	* src/ServerHost.cc: Removed
	* src/ServerHost.h: Removed
	* test/BtDependencyTest.cc
	* test/FileEntryTest.cc
	* test/RequestGroupTest.cc

1 files changed, 17 insertions, 1 deletions

diff --git a/src/FileEntry.h b/src/FileEntry.h
index 93137fb7..f0b55700 100644
--- a/src/FileEntry.h
+++ b/src/FileEntry.h
@@ -68,7 +68,7 @@ private:
   // URIResult is stored in the ascending order of the time when its result is
   // available.
   std::deque<URIResult> _uriResults;
-
+  bool _singleHostMultiConnection;
   Logger* _logger;
 
   void storePool(const SharedHandle<Request>& request);
@@ -142,6 +142,12 @@ public:
     _uris = uris;
   }
 
+  template<typename InputIterator>
+  void addUris(InputIterator first, InputIterator last)
+  {
+    _uris.insert(_uris.end(), first, last);
+  }
+
   // Inserts _uris and _spentUris into uris.
   void getUris(std::deque<std::string>& uris) const;
 
@@ -201,6 +207,16 @@ public:
   // The extracted URIResults are removed from _uriResults.
   void extractURIResult
   (std::deque<URIResult>& res, downloadresultcode::RESULT r);
+
+  void disableSingleHostMultiConnection()
+  {
+    _singleHostMultiConnection = false;
+  }
+
+  bool isSingleHostMultiConnectionEnabled() const
+  {
+    return _singleHostMultiConnection;
+  }
 };
 
 typedef SharedHandle<FileEntry> FileEntryHandle;