From b7664e8d6ebb9cfe8f3719616656d803935d9674 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Fri, 8 May 2009 16:58:44 +0000
Subject: [PATCH] 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
---
 ChangeLog              |  6 ++++++
 src/download_helper.cc | 13 +++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 229d84c6..29e4bbf4 100644
--- a/ChangeLog
+++ b/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
diff --git a/src/download_helper.cc b/src/download_helper.cc
index 3d906c8a..929ed1a7 100644
--- a/src/download_helper.cc
+++ b/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);
   }
 }