diff --git a/ChangeLog b/ChangeLog index 3d2403d7..e34b0499 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-07-09 Tatsuhiro Tsujikawa + + Documented that aria2 supports Chromium/Google Chrom cookies file. + * doc/aria2c.1.txt + * README + 2010-07-09 Tatsuhiro Tsujikawa Fixed the bug that aria2 cannot handle %2F in FTP URI properly. diff --git a/README b/README index 9e86d0d9..8faac946 100644 --- a/README +++ b/README @@ -36,7 +36,8 @@ Here is a list of features. * Verify peer using given trusted CA certificate in HTTPS * Client certificate authentication in HTTPS * Chunked transfer encoding support -* Load Cookies from file using the Firefox3 format and the Mozilla/Firefox +* Load Cookies from file using the Firefox3 format, Chromium/Google Chrome + and the Mozilla/Firefox (1.x/2.x)/Netscape format. * Save Cookies in the Mozilla/Firefox (1.x/2.x)/Netscape format. * Custom HTTP Header support @@ -66,17 +67,17 @@ Dependency .External Library Dependency [options="header"] -|================================================= -|features |dependency -|HTTPS |GnuTLS or OpenSSL -|BitTorrent |GnuTLS+Libgcrypt or OpenSSL -|Metalink |libxml2 or Expat. -|Checksum |GnuTLS+Libgcrypt or OpenSSL -|gzip, deflate in HTTP|zlib -|Async DNS |C-Ares -|Firefox3 cookie |libsqlite3 -|XML-RPC |libxml2 or Expat. -|================================================= +|==================================================== +|features |dependency +|HTTPS |GnuTLS or OpenSSL +|BitTorrent |GnuTLS+Libgcrypt or OpenSSL +|Metalink |libxml2 or Expat. +|Checksum |GnuTLS+Libgcrypt or OpenSSL +|gzip, deflate in HTTP |zlib +|Async DNS |C-Ares +|Firefox3/Chromium cookie|libsqlite3 +|XML-RPC |libxml2 or Expat. +|==================================================== Note;; GNU TLS has precedence over OpenSSL if both libraries are installed. @@ -106,7 +107,7 @@ distribution you use): * libc-ares-dev (Required for async DNS support) * libxml2-dev (Required for Metalink support) * zlib1g-dev (Required for gzip, deflate decoding support in HTTP) -* libsqlite3-dev (Required for Firefox3 cookie support) +* libsqlite3-dev (Required for Firefox3/Chromium cookie support) You can use libssl-dev instead of libgnutls-dev,libgpg-error-dev,libgcrypt-dev: diff --git a/README.html b/README.html index 209f5ed2..7a1753ec 100644 --- a/README.html +++ b/README.html @@ -646,7 +646,8 @@ Chunked transfer encoding support

  • -Load Cookies from file using the Firefox3 format and the Mozilla/Firefox +Load Cookies from file using the Firefox3 format, Chromium/Google Chrome + and the Mozilla/Firefox (1.x/2.x)/Netscape format.

    • @@ -758,7 +759,7 @@ cellspacing="0" cellpadding="4"> -features +features dependency @@ -788,7 +789,7 @@ cellspacing="0" cellpadding="4">

    C-Ares

    -

    Firefox3 cookie

    +

    Firefox3/Chromium cookie

    libsqlite3

    @@ -868,7 +869,7 @@ zlib1g-dev (Required for gzip, deflate decoding support in HTTP)

  • -libsqlite3-dev (Required for Firefox3 cookie support) +libsqlite3-dev (Required for Firefox3/Chromium cookie support)

    • @@ -1056,7 +1057,7 @@ man aria2c
    diff --git a/doc/aria2c.1 b/doc/aria2c.1 index b8f547aa..2b39e573 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: 06/28/2010 +.\" Date: 07/09/2010 .\" Manual: Aria2 Manual -.\" Source: Aria2 1.9.4 +.\" Source: Aria2 1.9.5 .\" Language: English .\" -.TH "ARIA2C" "1" "06/28/2010" "Aria2 1\&.9\&.4" "Aria2 Manual" +.TH "ARIA2C" "1" "07/09/2010" "Aria2 1\&.9\&.5" "Aria2 Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -480,7 +480,7 @@ Append HEADER to HTTP request header\&. You can use this option repeatedly to sp .PP \fB\-\-load\-cookies\fR=FILE .RS 4 -Load Cookies from FILE using the Firefox3 format (SQLite3) and the Mozilla/Firefox(1\&.x/2\&.x)/Netscape format\&. +Load Cookies from FILE using the Firefox3 format (SQLite3), Chromium/Google Chrome (SQLite3) and the Mozilla/Firefox(1\&.x/2\&.x)/Netscape format\&. .RE .if n \{\ .sp @@ -495,7 +495,7 @@ Load Cookies from FILE using the Firefox3 format (SQLite3) and the Mozilla/Firef .ps -1 .br .sp -If aria2 is built without libsqlite3, then it doesn\(cqt support Firefox3 cookie format\&. +If aria2 is built without libsqlite3, then it doesn\(cqt support Firefox3 and Chromium/Google Chrome cookie format\&. .sp .5v .RE .PP @@ -2623,7 +2623,7 @@ GID(or gid) is the key to manage each download\&. Each download has an unique GI .sp \fBaria2\&.addUri\fR \fIuris[, options[, position]]\fR .sp -This method adds new HTTP(S)/FTP/BitTorrent Magnet URI\&. \fIuris\fR is of type array and its element is URI which is of type string\&. For BitTorrent Magnet URI, \fIuris\fR must have only one element and it should be BitTorrent Magnet URI\&. URIs in \fIuris\fR must point to the same file\&. For example, a file \fIchunkybaconlinux\&.iso\fR is hosted in 2 locations: http://server/chunkybaconlinux\&.iso and http://mirror/chunkybaconlinux\&.iso\&. You can download this iso image using 2 URIs issuing aria2\&.addUri([\fIhttp://server/chunkybaconlinux\&.iso\fR, \fIhttp://mirror/chunkybaconlinux\&.iso\fR])\&. Imagine there is an another file URI, say, http://mirror2/chunkydonutslinux\&.iso, which is different iso image\&. You cannot mix this URI with previous URIs in one aria2\&.addUri command\&. If you do, aria2 does not complain but download may fail\&. \fIoptions\fR is of type struct and its members are a pair of option name and value\&. See \fBOptions\fR below for more details\&. If \fIposition\fR is given as an integer starting from 0, the new download is inserted at \fIposition\fR in the waiting queue\&. If \fIposition\fR is not given or \fIposition\fR is larger than the size of the queue, it is appended at the end of the queue\&. This method returns GID of registered download\&. +This method adds new HTTP(S)/FTP/BitTorrent Magnet URI\&. \fIuris\fR is of type array and its element is URI which is of type string\&. For BitTorrent Magnet URI, \fIuris\fR must have only one element and it should be BitTorrent Magnet URI\&. URIs in \fIuris\fR must point to the same file\&. For example, a file chunkybaconlinux\&.iso is hosted in 2 locations: http://server/chunkybaconlinux\&.iso and http://mirror/chunkybaconlinux\&.iso\&. You can download this iso image using 2 URIs by issuing aria2\&.addUri([\fIhttp://server/chunkybaconlinux\&.iso\fR, \fIhttp://mirror/chunkybaconlinux\&.iso\fR])\&. Imagine there is an another file URI, say, http://mirror2/chunkydonutslinux\&.iso, which is different iso image\&. You cannot mix this URI with previous URIs in one aria2\&.addUri command\&. If you do, aria2 does not complain but download may fail\&. \fIoptions\fR is of type struct and its members are a pair of option name and value\&. See \fBOptions\fR below for more details\&. If \fIposition\fR is given as an integer starting from 0, the new download is inserted at \fIposition\fR in the waiting queue\&. If \fIposition\fR is not given or \fIposition\fR is larger than the size of the queue, it is appended at the end of the queue\&. This method returns GID of registered download\&. .sp \fBaria2\&.addTorrent\fR \fItorrent[, uris[, options[, position]]]\fR .sp @@ -3879,7 +3879,7 @@ aria2c \-\-load\-cookies=cookies\&.txt "http://host/file\&.zip" .ps -1 .br .sp -You can use Firefox/Mozilla\(cqs cookie file without modification\&. +You can use Firefox/Mozilla/Chromium\(cqs cookie file without modification\&. .sp .5v .RE .RE diff --git a/doc/aria2c.1.html b/doc/aria2c.1.html index 68bdf01b..44871033 100644 --- a/doc/aria2c.1.html +++ b/doc/aria2c.1.html @@ -1143,7 +1143,8 @@ response header.

    - Load Cookies from FILE using the Firefox3 format (SQLite3) and the + Load Cookies from FILE using the Firefox3 format (SQLite3), + Chromium/Google Chrome (SQLite3) and the Mozilla/Firefox(1.x/2.x)/Netscape format.

    @@ -1153,7 +1154,8 @@ response header.
    Note
    -If aria2 is built without libsqlite3, then it doesn’t support Firefox3 cookie format. +If aria2 is built without libsqlite3, then it doesn’t support Firefox3 +and Chromium/Google Chrome cookie format.
    @@ -3065,10 +3067,10 @@ GID type array and its element is URI which is of type string. For BitTorrent Magnet URI, uris must have only one element and it should be BitTorrent Magnet URI. URIs in uris must point to the same -file. For example, a file chunkybaconlinux.iso is hosted in 2 +file. For example, a file chunkybaconlinux.iso is hosted in 2 locations: http://server/chunkybaconlinux.iso and http://mirror/chunkybaconlinux.iso. You can download this iso image -using 2 URIs issuing +using 2 URIs by issuing aria2.addUri([http://server/chunkybaconlinux.iso, http://mirror/chunkybaconlinux.iso]). Imagine there is an another file URI, say, http://mirror2/chunkydonutslinux.iso, which is @@ -4086,7 +4088,7 @@ forwarding, it’s up to you to do it manually.
    Note
    -You can use Firefox/Mozilla’s cookie file without modification. +You can use Firefox/Mozilla/Chromium’s cookie file without modification.

    Resume download started by web browsers or another programs

    @@ -4212,7 +4214,7 @@ files in the program, then also delete it here.

    diff --git a/doc/aria2c.1.txt b/doc/aria2c.1.txt index 6b3ca8dc..48764137 100644 --- a/doc/aria2c.1.txt +++ b/doc/aria2c.1.txt @@ -327,11 +327,14 @@ response header. aria2c *--header*="X-A: b78" *--header*="X-B: 9J1" "http://host/file" *--load-cookies*=FILE:: - Load Cookies from FILE using the Firefox3 format (SQLite3) and the + + Load Cookies from FILE using the Firefox3 format (SQLite3), + Chromium/Google Chrome (SQLite3) and the Mozilla/Firefox(1.x/2.x)/Netscape format. [NOTE] -If aria2 is built without libsqlite3, then it doesn't support Firefox3 cookie format. +If aria2 is built without libsqlite3, then it doesn't support Firefox3 +and Chromium/Google Chrome cookie format. *--save-cookies*=FILE:: @@ -2146,7 +2149,7 @@ Load cookies aria2c --load-cookies=cookies.txt "http://host/file.zip" -------------------------------------------------------- [NOTE] -You can use Firefox/Mozilla's cookie file without modification. +You can use Firefox/Mozilla/Chromium's cookie file without modification. Resume download started by web browsers or another programs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^