Ver código fonte

2009-05-09 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	The available options in -i list should be listed in
	listRequestOptions().
	* src/download_helper.cc
Tatsuhiro Tsujikawa 16 anos atrás
pai
commit
b7664e8d6e
2 arquivos alterados com 17 adições e 2 exclusões
  1. 6 0
      ChangeLog
  2. 11 2
      src/download_helper.cc

+ 6 - 0
ChangeLog

@@ -1,3 +1,9 @@
+2009-05-09  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	The available options in -i list should be listed in
+	listRequestOptions().
+	* src/download_helper.cc
+	
 2009-05-09  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Added infoHash, pieceLength, numPieces value for tellActiveStatus

+ 11 - 2
src/download_helper.cc

@@ -307,11 +307,20 @@ static void createRequestGroupForUriList
   UriListParser p(in);
   while(p.hasNext()) {
     std::deque<std::string> uris;
-    SharedHandle<Option> requestOption(new Option(*option.get()));
-    p.parseNext(uris, *requestOption.get());
+    SharedHandle<Option> tempOption(new Option());
+    p.parseNext(uris, *tempOption.get());
     if(uris.empty()) {
       continue;
     }
+
+    SharedHandle<Option> requestOption(new Option(*option.get()));
+    for(std::vector<std::string>::const_iterator i =
+	  listRequestOptions().begin(); i != listRequestOptions().end(); ++i) {
+      if(tempOption->defined(*i)) {
+	requestOption->put(*i, tempOption->get(*i));
+      }
+    }
+
     createRequestGroupForUri(result, requestOption, uris);
   }
 }