2010-03-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

Added bt-enable-lpt, reuse-uri and {http,https,ftp,all}-proxy-{user,passwd} options to -i list options. * doc/aria2c.1.txt * doc/xmlrpc/aria2rpc * src/download_helper.cc
2010-03-11 15:32:36 +00:00 · 2010-03-11 15:32:36 +00:00 · dc059bfc29
parent f16a1d0e30
commit dc059bfc29
6 changed files with 204 additions and 1 deletions
--- a/9
+++ b/9
@ -1,3 +1,12 @@
+2010-03-12  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Added bt-enable-lpt, reuse-uri
+	and {http,https,ftp,all}-proxy-{user,passwd} options to -i list
+	options.
+	* doc/aria2c.1.txt
+	* doc/xmlrpc/aria2rpc
+	* src/download_helper.cc
+
 2010-03-12  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>

 	Use global option for PREF_LISTEN_PORT and PREF_BT_LPD_INTERFACE.
--- a/doc/aria2c.1
+++ b/doc/aria2c.1
@ -1464,6 +1464,28 @@ all\-proxy
 .sp -1
 .IP \(bu 2.3
 .\}
+all\-proxy\-user
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+all\-proxy\-passwd
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 connect\-timeout
 .RE
 .sp
@ -1640,6 +1662,28 @@ http\-proxy
 .sp -1
 .IP \(bu 2.3
 .\}
+http\-proxy\-user
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+http\-proxy\-passwd
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 https\-proxy
 .RE
 .sp
@ -1651,6 +1695,28 @@ https\-proxy
 .sp -1
 .IP \(bu 2.3
 .\}
+https\-proxy\-user
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+https\-proxy\-passwd
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 referer
 .RE
 .sp
@ -1761,6 +1827,28 @@ ftp\-proxy
 .sp -1
 .IP \(bu 2.3
 .\}
+ftp\-proxy\-user
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+ftp\-proxy\-passwd
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 ftp\-type
 .RE
 .sp
@ -1794,6 +1882,17 @@ no\-netrc
 .sp -1
 .IP \(bu 2.3
 .\}
+reuse\-uri
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 select\-file
 .RE
 .sp
@ -1805,6 +1904,17 @@ select\-file
 .sp -1
 .IP \(bu 2.3
 .\}
+bt\-enable\-lpd
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 bt\-external\-ip
 .RE
 .sp
--- a/doc/aria2c.1.html
+++ b/doc/aria2c.1.html
@ -2359,6 +2359,16 @@ all-proxy
 </li>
 <li>
 <p>
+all-proxy-user
+</p>
+</li>
+<li>
+<p>
+all-proxy-passwd
+</p>
+</li>
+<li>
+<p>
 connect-timeout
 </p>
 </li>
@ -2439,11 +2449,31 @@ http-proxy
 </li>
 <li>
 <p>
+http-proxy-user
+</p>
+</li>
+<li>
+<p>
+http-proxy-passwd
+</p>
+</li>
+<li>
+<p>
 https-proxy
 </p>
 </li>
 <li>
 <p>
+https-proxy-user
+</p>
+</li>
+<li>
+<p>
+https-proxy-passwd
+</p>
+</li>
+<li>
+<p>
 referer
 </p>
 </li>
@ -2494,6 +2524,16 @@ ftp-proxy
 </li>
 <li>
 <p>
+ftp-proxy-user
+</p>
+</li>
+<li>
+<p>
+ftp-proxy-passwd
+</p>
+</li>
+<li>
+<p>
 ftp-type
 </p>
 </li>
@ -2509,11 +2549,21 @@ no-netrc
 </li>
 <li>
 <p>
+reuse-uri
+</p>
+</li>
+<li>
+<p>
 select-file
 </p>
 </li>
 <li>
 <p>
+bt-enable-lpd
+</p>
+</li>
+<li>
+<p>
 bt-external-ip
 </p>
 </li>
@ -3914,7 +3964,7 @@ files in the program, then also delete it here.</p></div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2010-03-11 23:51:12 JST
+Last updated 2010-03-12 00:27:52 JST
 </div>
 </div>
 </body>
--- a/doc/aria2c.1.txt
+++ b/doc/aria2c.1.txt
@ -1045,6 +1045,8 @@ of URIs. These optional lines must start with white space(s).
 * check-integrity
 * continue
 * all-proxy
+* all-proxy-user
+* all-proxy-passwd
 * connect-timeout
 * dry-run
 * lowest-speed-limit
@ -1061,7 +1063,11 @@ of URIs. These optional lines must start with white space(s).
 * http-user
 * http-passwd
 * http-proxy
+* http-proxy-user
+* http-proxy-passwd
 * https-proxy
+* https-proxy-user
+* https-proxy-passwd
 * referer
 * enable-http-keep-alive
 * enable-http-pipelining
@ -1072,10 +1078,14 @@ of URIs. These optional lines must start with white space(s).
 * ftp-passwd
 * ftp-pasv
 * ftp-proxy
+* ftp-proxy-user
+* ftp-proxy-passwd
 * ftp-type
 * ftp-reuse-connection
 * no-netrc
+* reuse-uri
 * select-file
+* bt-enable-lpd
 * bt-external-ip
 * bt-hash-check-seed
 * bt-max-open-files
--- a/doc/xmlrpc/aria2rpc
+++ b/doc/xmlrpc/aria2rpc
@ -36,6 +36,8 @@ OptionParser.new do |opt|
    options["continue"]=val||"true"
  }
  opt.on("--all-proxy PROXY"){|val| options["all-proxy"]=val}
+  opt.on("--all-proxy-user USER"){|val| options["all-proxy-user"]=val}
+  opt.on("--all-proxy-passwd PASSWD"){|val| options["all-proxy-passwd"]=val}
  opt.on("--connect-timeout SEC"){|val| options["connect-timeout"]=val}
  opt.on("--dry-run [BOOL]",["true","false"]){|val|
    options["dry-run"]=val||"true"
@ -60,7 +62,11 @@ OptionParser.new do |opt|
  opt.on("--http-user USER"){|val| options["http-user"]=val}
  opt.on("--http-passwd PASSWD"){|val| options["http-passwd"]=val}
  opt.on("--http-proxy PROXY"){|val| options["http-proxy"]=val}
+  opt.on("--http-proxy-user USER"){|val| options["http-proxy-user"]=val}
+  opt.on("--http-proxy-passwd PASSWD"){|val| options["http-proxy-passwd"]=val}
  opt.on("--https-proxy PROXY"){|val| options["https-proxy"]=val}
+  opt.on("--https-proxy-user USER"){|val| options["https-proxy-user"]=val}
+  opt.on("--https-proxy-passwd PASSWD"){|val| options["https-proxy-passwd"]=val}
  opt.on("--referer REFERER"){|val| options["referer"]=val}
  opt.on("--enable-http-keep-alive [BOOL]",["true","false"]){|val|
    options["enable-http-keep-alive"]=val||"true"
@ -82,6 +88,8 @@ OptionParser.new do |opt|
    options["ftp-pasv"]=val||"true"
  }
  opt.on("--ftp-proxy PROXY"){|val| options["ftp-proxy"]=val}
+  opt.on("--ftp-proxy-user USER"){|val| options["ftp-proxy-user"]=val}
+  opt.on("--ftp-proxy-passwd PASSWD"){|val| options["ftp-proxy-passwd"]=val}
  opt.on("--ftp-type TYPE"){|val| options["ftp-type"]=val}
  opt.on("--ftp-reuse-connection [BOOL]",["true","false"]){|val|
    options["ftp-reuse-connection"]=val||"true"
@ -89,7 +97,13 @@ OptionParser.new do |opt|
  opt.on("-n","--no-netrc [BOOL]",["true","false"]){|val|
    options["no-netrc"]=val||"true"
  }
+  opt.on("--reuse-uri [BOOL]",["true","false"]){|val|
+    options["reuse-uri"]=val||"true"
+  }
  opt.on("--select-file INDEXES"){|val| options["select-file"]=val}
+  opt.on("--bt-enable-lpd [BOOL]",["true","false"]){|val|
+    options["bt-enable-lpd"]=val||"true"
+  }
  opt.on("--bt-external-ip IPADDRESS"){|val| options["bt-external-ip"]=val}
  opt.on("--bt-hash-check-seed [BOOL]",["true","false"]){|val|
    options["bt-hash-check-seed"]=val||"true"
--- a/src/download_helper.cc
+++ b/src/download_helper.cc
@ -76,6 +76,8 @@ const std::set<std::string>& listRequestOptions()
    PREF_CHECK_INTEGRITY,
    PREF_CONTINUE,
    PREF_ALL_PROXY,
+    PREF_ALL_PROXY_USER,
+    PREF_ALL_PROXY_PASSWD,
    PREF_CONNECT_TIMEOUT,
    PREF_DRY_RUN,
    PREF_LOWEST_SPEED_LIMIT,
@ -92,7 +94,11 @@ const std::set<std::string>& listRequestOptions()
    PREF_HTTP_USER,
    PREF_HTTP_PASSWD,
    PREF_HTTP_PROXY,
+    PREF_HTTP_PROXY_USER,
+    PREF_HTTP_PROXY_PASSWD,
    PREF_HTTPS_PROXY,
+    PREF_HTTPS_PROXY_USER,
+    PREF_HTTPS_PROXY_PASSWD,
    PREF_REFERER,
    PREF_ENABLE_HTTP_KEEP_ALIVE,
    PREF_ENABLE_HTTP_PIPELINING,
@ -103,10 +109,14 @@ const std::set<std::string>& listRequestOptions()
    PREF_FTP_PASSWD,
    PREF_FTP_PASV,
    PREF_FTP_PROXY,
+    PREF_FTP_PROXY_USER,
+    PREF_FTP_PROXY_PASSWD,
    PREF_FTP_TYPE,
    PREF_FTP_REUSE_CONNECTION,
    PREF_NO_NETRC,
+    PREF_REUSE_URI,
    PREF_SELECT_FILE,
+    PREF_BT_ENABLE_LPD,
    PREF_BT_EXTERNAL_IP,
    PREF_BT_HASH_CHECK_SEED,
    PREF_BT_MAX_OPEN_FILES,