diff --git a/ChangeLog b/ChangeLog index e3b6b8ae..faf07f16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2010-04-03 Tatsuhiro Tsujikawa + + Added bt-tracker-timeout, bt-tracker-connect-timeout, + always-resume, max-resume-failure-tries and http-accept-gzip to -i + list options. + * doc/aria2c.1.txt + * doc/xmlrpc/aria2rpc + * src/download_helper.cc + 2010-04-03 Tatsuhiro Tsujikawa Fixed the bug that web-seed URI is not percent-encoded. diff --git a/doc/aria2c.1 b/doc/aria2c.1 index f8255184..c56cf6a7 100644 --- a/doc/aria2c.1 +++ b/doc/aria2c.1 @@ -2,12 +2,12 @@ .\" Title: aria2c .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 04/02/2010 +.\" Date: 04/03/2010 .\" Manual: Aria2 Manual .\" Source: Aria2 1.9.1a .\" Language: English .\" -.TH "ARIA2C" "1" "04/02/2010" "Aria2 1\&.9\&.1a" "Aria2 Manual" +.TH "ARIA2C" "1" "04/03/2010" "Aria2 1\&.9\&.1a" "Aria2 Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -2192,6 +2192,28 @@ bt\-tracker\-interval .sp -1 .IP \(bu 2.3 .\} +bt\-tracker\-timeout +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +bt\-tracker\-connect\-timeout +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} enable\-peer\-exchange .RE .sp @@ -2448,6 +2470,39 @@ realtime\-chunk\-checksum remove\-control\-file .RE .sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +always\-resume +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +max\-resume\-failure\-tries +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} +http\-accept\-gzip +.RE +.sp These options have exactly same meaning of the ones in the command\-line options, but it just applies to the URIs it belongs to\&. .sp For example, the content of uri\&.txt is diff --git a/doc/aria2c.1.html b/doc/aria2c.1.html index 6e21262b..412e7617 100644 --- a/doc/aria2c.1.html +++ b/doc/aria2c.1.html @@ -2762,6 +2762,16 @@ bt-tracker-interval

  • +bt-tracker-timeout +

    +
    • +
  • +

    +bt-tracker-connect-timeout +

    +
    • +
  • +

    enable-peer-exchange

    • @@ -2880,6 +2890,21 @@ realtime-chunk-checksum remove-control-file

    +
  • +

    +always-resume +

    +
    • +
  • +

    +max-resume-failure-tries +

    +
    • +
  • +

    +http-accept-gzip +

    +

    • These options have exactly same meaning of the ones in the command-line options, but it just applies to the URIs it belongs to.

    @@ -4112,7 +4137,7 @@ files in the program, then also delete it here.

    diff --git a/doc/aria2c.1.txt b/doc/aria2c.1.txt index 1f431700..1dba74dd 100644 --- a/doc/aria2c.1.txt +++ b/doc/aria2c.1.txt @@ -1178,6 +1178,8 @@ of URIs. These optional lines must start with white space(s). * bt-seed-unverified * bt-stop-timeout * bt-tracker-interval +* bt-tracker-timeout +* bt-tracker-connect-timeout * enable-peer-exchange * follow-torrent * index-out @@ -1202,6 +1204,9 @@ of URIs. These optional lines must start with white space(s). * parameterized-uri * realtime-chunk-checksum * remove-control-file +* always-resume +* max-resume-failure-tries +* http-accept-gzip These options have exactly same meaning of the ones in the command-line options, but it just applies to the URIs it belongs to. diff --git a/doc/xmlrpc/aria2rpc b/doc/xmlrpc/aria2rpc index acb9c294..0aa86903 100755 --- a/doc/xmlrpc/aria2rpc +++ b/doc/xmlrpc/aria2rpc @@ -133,6 +133,10 @@ OptionParser.new do |opt| } opt.on("--bt-stop-timeout SEC"){|val| options["bt-stop-timeout"]=val} opt.on("--bt-tracker-interval SEC"){|val| options["bt-tracker-interval"]=val} + opt.on("--bt-tracker-timeout SEC"){|val| options["bt-tracker-timeout"]=val} + opt.on("--bt-tracker-connect-timeout SEC"){|val| + options["bt-tracker-connect-timeout"]=val + } opt.on("--enable-peer-exchange [BOOL]",["true","false"]){|val| options["enable-peer-exchange"]=val||"true" } @@ -188,6 +192,15 @@ OptionParser.new do |opt| opt.on("--remove-control-file [BOOL]",["true","false"]){|val| options["remove-control-file"]=val||"true" } + opt.on("--always-resume [BOOL]",["true","false"]){|val| + options["always-resume"]=val||"true" + } + opt.on("--max-resume-failure-tries N"){|val| + options["max-resume-failure-tries"]=val + } + opt.on("--http-accept-gzip [BOOL]",["true","false"]){|val| + options["http-accept-gzip"]=val||"true" + } opt.on("--max-overall-download-limit LIMIT"){|val| options["max-overall-download-limit"]=val} opt.on("--max-overall-upload-limit LIMIT"){|val| options["max-overall-upload-limit"]=val} opt.on("-j","--max-concurrent-downloads N"){|val| options["max-concurrent-downloads"]=val} diff --git a/src/download_helper.cc b/src/download_helper.cc index 5a642d9e..f2f6ecfb 100644 --- a/src/download_helper.cc +++ b/src/download_helper.cc @@ -130,6 +130,8 @@ const std::set& listRequestOptions() PREF_BT_SEED_UNVERIFIED, PREF_BT_STOP_TIMEOUT, PREF_BT_TRACKER_INTERVAL, + PREF_BT_TRACKER_TIMEOUT, + PREF_BT_TRACKER_CONNECT_TIMEOUT, PREF_ENABLE_PEER_EXCHANGE, PREF_FOLLOW_TORRENT, PREF_INDEX_OUT, @@ -153,7 +155,10 @@ const std::set& listRequestOptions() PREF_NO_FILE_ALLOCATION_LIMIT, PREF_PARAMETERIZED_URI, PREF_REALTIME_CHUNK_CHECKSUM, - PREF_REMOVE_CONTROL_FILE + PREF_REMOVE_CONTROL_FILE, + PREF_ALWAYS_RESUME, + PREF_MAX_RESUME_FAILURE_TRIES, + PREF_HTTP_ACCEPT_GZIP }; static std::set requestOptions (vbegin(REQUEST_OPTIONS), vend(REQUEST_OPTIONS));