Added man page

ChangeLog

@@ -14,8 +14,16 @@
 	(nameResolverFinished): New function.
 	* src/FtpInitiateConnectionCommand.h
 	(nameResolverFinished): New function.
+	* src/FtpInitiateConnectionCommand.cc
+	(FtpInitiateConnectionCommand): Set timeout to PREF_DNS_TIMEOUT.
 	* src/HttpInitiateConnectionCommand.h
 	(nameResolverFinished): New function.
+	* src/HttpInitiateConnectionCommand.cc
+	(HttpInitiateConnectionCommand): Set timeout to PREF_DNS_TIMEOUT.
+	* src/prefs.h
+	(PREF_DNS_TIMEOUT): New definition.
+	* src/main.cc
+	(main): Added PREF_DNS_TIMEOUT.
 
 	To add the support for a non-compact response from a tracker:
 
@@ -57,6 +65,7 @@
 
 	* src/main.cc
 	(showVersion): Updated.
+	(showUsage): Updated.
 	
 2006-09-23  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 

Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = intl  m4 po src test
+SUBDIRS = intl  m4 po src test doc
 
 ACLOCAL_AMFLAGS = -I m4
 

Makefile.in

@@ -220,7 +220,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-SUBDIRS = intl  m4 po src test
+SUBDIRS = intl  m4 po src test doc
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = config.rpath
 all: config.h

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for aria2c 0.8.0.
+# Generated by GNU Autoconf 2.59 for aria2c 0.8.1.
 #
 # Report bugs to <[email protected]>.
 #
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='aria2c'
 PACKAGE_TARNAME='aria2c'
-PACKAGE_VERSION='0.8.0'
-PACKAGE_STRING='aria2c 0.8.0'
+PACKAGE_VERSION='0.8.1'
+PACKAGE_STRING='aria2c 0.8.1'
 PACKAGE_BUGREPORT='[email protected]'
 
 ac_unique_file="src/Socket.h"
@@ -788,7 +788,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures aria2c 0.8.0 to adapt to many kinds of systems.
+\`configure' configures aria2c 0.8.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -854,7 +854,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of aria2c 0.8.0:";;
+     short | recursive ) echo "Configuration of aria2c 0.8.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1004,7 +1004,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-aria2c configure 0.8.0
+aria2c configure 0.8.1
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1018,7 +1018,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by aria2c $as_me 0.8.0, which was
+It was created by aria2c $as_me 0.8.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1661,7 +1661,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='aria2c'
- VERSION='0.8.0'
+ VERSION='0.8.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3824,7 +3824,7 @@ else
 echo "${ECHO_T}no" >&6
 fi
 
-  min_xml_version=2.6.26
+  min_xml_version=2.6.24
   echo "$as_me:$LINENO: checking for libxml - version >= $min_xml_version" >&5
 echo $ECHO_N "checking for libxml - version >= $min_xml_version... $ECHO_C" >&6
   no_xml=""
@@ -11800,7 +11800,7 @@ _ACEOF
 fi
 done
 
-                                                            ac_config_files="$ac_config_files Makefile src/Makefile test/Makefile po/Makefile.in m4/Makefile intl/Makefile"
+                                                                      ac_config_files="$ac_config_files Makefile src/Makefile test/Makefile po/Makefile.in m4/Makefile intl/Makefile doc/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -12227,7 +12227,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by aria2c $as_me 0.8.0, which was
+This file was extended by aria2c $as_me 0.8.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12290,7 +12290,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-aria2c config.status 0.8.0
+aria2c config.status 0.8.1
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -12413,6 +12413,7 @@ do
   "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
   "m4/Makefile" ) CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
   "intl/Makefile" ) CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
+  "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 #
 AC_PREREQ(2.59)
-AC_INIT(aria2c, 0.8.0, [email protected])
+AC_INIT(aria2c, 0.8.1, [email protected])
 AM_INIT_AUTOMAKE()
 AM_PATH_CPPUNIT(1.10.2)
 AC_CONFIG_SRCDIR([src/Socket.h])
@@ -31,7 +31,7 @@ AC_PROG_YACC
 
 # Checks for libraries.
 if test "x$with_libxml2" = "xyes"; then
-   AM_PATH_XML2([2.6.26], [have_libxml2=yes])
+   AM_PATH_XML2([2.6.24], [have_libxml2=yes])
    if test "x$have_libxml2" = "xyes"; then
       AC_DEFINE([HAVE_LIBXML2], [1], [Define to 1 if you have libxml2.])
    fi
@@ -128,5 +128,6 @@ AC_CONFIG_FILES([Makefile
 		test/Makefile
 		po/Makefile.in
 		m4/Makefile
-		intl/Makefile])
+		intl/Makefile
+		doc/Makefile])
 AC_OUTPUT

doc/Makefile.am

@@ -0,0 +1,2 @@
+man_MANS = aria2c.1
+EXTRA_DIST = $(man_MANS)

doc/aria2c.1

@@ -0,0 +1,277 @@
+.TH "ARIA2C" 1 "October 2006" "aria2 0.8.1"
+
+.SH NAME
+.P
+aria2c \- The high speed download utility
+
+.SH SYNOPSIS
+.TS
+tab(^); l.
+ aria2c [\fIoptions\fR] \fIURL\fR ...
+ aria2c [\fIoptions\fR] \fB\-T\fR \fITORRENT_FILE FILE\fR ...
+ aria2c [\fIoptions\fR] \fB\-M\fR \fIMETALINK_FILE\fR
+.TE
+
+.SH DESCRIPTION
+.P
+aria2 is a utility for downloading files. It has completely new design
+concept from its predecessor, Aria, and is written from scratch.
+aria2 has a segmented downloading engine in its core.
+It can download one file from multiple URLs or multiple connections from one
+URL. This results in very high speed downloading, much faster than ordinary
+browsers. This engine in was implemented in a single\-thread model.
+The architecture is clean and easy to extend. aria2 currently supports HTTP,
+FTP, and BitTorrent. It also supports Metalink version 3.0.
+
+.P
+Please visit the project web site at \fIhttp://aria2.sourceforge.net\fR.
+
+.SH OPTIONS
+.TP
+\fB\-d\fR, \fB\-\-dir\fR=\fIDIR\fR
+The directory to store downloaded file.
+
+.TP
+\fB\-o\fR, \fB\-\-out\fR=\fIFILE\fR
+The file name for downloaded file.
+
+.TP
+\fB\-l\fR, \fB\-\-log\fR=\fILOG\fR
+The file path to store log. If '\-' is specified,
+log is written to stdout.
+
+.TP
+\fB\-D\fR, \fB\-\-daemon\fR
+Run as daemon.
+
+.TP
+\fB\-s\fR, \fB\-\-split\fR=\fIN\fR
+Download a file using \fIN\fR connections. \fIN\fR must be
+between 1 and 5. This option affects all URLs.
+Thus, aria2 connects to each URL with
+\fIN\fR connections.
+
+.TP
+\fB\-\-retry\-wait\fR=\fISEC\fR
+Set amount of time in second between requests
+for errors. Specify a value between 0 and 60.
+Default: 5
+
+.TP
+\fB\-t\fR, \fB\-\-timeout\fR=\fISEC\fR
+Set timeout in second. Default: 60
+
+.TP
+\fB\-m\fR, \fB\-\-max\-tries\fR=\fIN\fR
+Set number of tries. 0 means unlimited.
+Default: 5
+
+.TP
+\fB\-\-http\-proxy\fR=\fIHOST\fR:\fIPORT\fR
+Use HTTP proxy server. This affects to all
+URLs.
+
+.TP
+\fB\-\-http\-user\fR=\fIUSER\fR
+Set HTTP user. This affects to all URLs.
+
+.TP
+\fB\-\-http\-passwd\fR=\fIPASSWD\fR
+Set HTTP password. This affects to all URLs.
+
+.TP
+\fB\-\-http\-proxy\-user\fR=\fIUSER\fR
+Set HTTP proxy user. This affects to all URLs
+
+.TP
+\fB\-\-http\-proxy\-passwd\fR=\fIPASSWD\fR
+Set HTTP proxy password. This affects to all URLs.
+
+.TP
+\fB\-\-http\-proxy\-method\fR=\fIMETHOD\fR
+Set the method to use in proxy request.
+\fIMETHOD\fR is either 'get' or 'tunnel'.
+Default: tunnel
+
+.TP
+\fB\-\-http\-auth\-scheme\fR=\fISCHEME\fR
+Set HTTP authentication scheme. Currently, basic
+is the only supported scheme.
+Default: basic
+
+.TP
+\fB\-\-referer\fR=\fIREFERER\fR
+Set Referer. This affects to all URLs.
+
+.TP
+\fB\-\-ftp\-user\fR=\fIUSER\fR
+Set FTP user. This affects to all URLs.
+Default: anonymous
+.TP
+\fB\-\-ftp\-passwd\fR=\fIPASSWD\fR
+Set FTP password. This affects to all URLs.
+Default: ARIA2USER@
+
+.TP
+\fB\-\-ftp\-type\fR=\fITYPE\fR
+Set FTP transfer type. TYPE is either 'binary'
+or 'ascii'.
+Default: binary
+
+.TP
+\fB\-p\fR, \fB\-\-ftp\-pasv\fR
+Use passive mode in FTP.
+
+.TP
+\fB\-\-ftp\-via\-http\-proxy\fR=\fIMETHOD\fR
+Use HTTP proxy in FTP. \fIMETHOD\fR is either 'get' or
+\&'tunnel'.
+Default: tunnel
+
+.TP
+\fB\-\-lowest\-speed\-limit\fR=\fISPEED\fR
+Close connection if download speed is lower than
+or equal to this value(bytes per sec).
+0 means aria2 does not care lowest speed limit.
+You can append K or M(1K = 1024, 1M = 1024K).
+This option does not affect BitTorrent download.
+Default: 0
+
+.TP
+\fB\-\-max\-download\-limit\fR=\fISPEED\fR
+Set max download speed in bytes per sec.
+0 means unrestricted.
+You can append K or M(1K = 1024, 1M = 1024K).
+Default: 0
+
+.TP
+\fB\-T\fR, \fB\-\-torrent\-file\fR=\fITORRENT_FILE\fR
+The file path to .torrent file.
+
+.TP
+\fB\-\-follow\-torrent\fR=true|false
+Setting this option to false prevents aria2 to
+enter BitTorrent mode even if the filename of
+downloaded file ends with .torrent.
+Default: true
+
+.TP
+\fB\-S\fR, \fB\-\-show\-files\fR
+Print file listing of .torrent file and exit.
+
+.TP
+\fB\-\-direct\-file\-mapping\fR=true|false
+Directly read from and write to each file
+mentioned in .torrent file.
+Default: true
+
+.TP
+\fB\-\-listen\-port\fR=\fIPORT\fR
+Set port number to listen to for peer connection.
+
+.TP
+\fB\-\-max\-upload\-limit\fR=\fISPEED\fR
+Set max upload speed in bytes per sec.
+0 means unrestricted.
+You can append K or M(1K = 1024, 1M = 1024K).
+Default: 0
+
+.TP
+\fB\-\-select\-file\fR=\fIINDEX\fR...
+Set file to download by specifing its index.
+You can know file index through \fB\-\-show\-files\fR
+option. Multiple indexes can be specified by using
+\&',' like "3,6".
+You can also use '\-' to specify rangelike "1\-5".
+\&',' and '\-' can be used together.
+
+.TP
+\fB\-\-seed\-time\fR=\fIMINUTES\fR
+Specify seeding time in minutes. See also
+\fB\-\-seed\-ratio\fR option.
+
+.TP
+\fB\-\-seed\-ratio\fR=\fIRATIO\fR
+Specify share ratio. Seed completed torrents until
+share ratio reaches RATIO. 1.0 is encouraged.
+If \fB\-\-seed\-time\fR option is specified along with
+this option, seeding ends when at least one of
+the conditions is satisfied.
+
+.TP
+\fB\-M\fR, \fB\-\-metalink\-file\fR=\fIMETALINK_FILE\fR
+The file path to .metalink file.
+
+.TP
+\fB\-C\fR, \fB\-\-metalink\-servers\fR=\fINUM_SERVERS\fR
+The number of servers to connect to
+simultaneously. If more than one connection per
+server is required, use \fB\-s\fR option.
+Default: 15
+
+.TP
+\fB\-\-metalink\-version\fR=\fIVERSION\fR
+The version of file to download.
+
+.TP
+\fB\-\-metalink\-language\fR=\fILANGUAGE\fR
+The language of file to download.
+
+.TP
+\fB\-\-metalink\-os\fR=\fIOS\fR
+The operating system the file is targeted.
+
+.TP
+\fB\-\-follow\-metalink\fR=true|false
+Setting this option to false prevents aria2 to
+enter Metalink mode even if the filename of
+downloaded file ends with .metalink.
+Default: true
+
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Print the version number and exit.
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print this message and exit.
+
+.TP
+\fIURL\fR
+You can specify multiple URLs. All URLs must point to the same file
+or downloading fails.
+
+.TP
+\fIFILE\fR
+Specify files in multi\-file torrent to download. Use conjunction with
+\fB\-T\fR option. This arguments are ignored if you specify \fB\-\-select\-file\fR option.
+
+.SH REPORTING BUGS
+.P
+Report bugs to <tujikawa at users dot sourceforge dot net>
+
+.SH COPYRIGHT
+.P
+Copyright (C) 2006 Tatsuhiro Tsujikawa
+
+.P
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+.P
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+.P
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110\-1301 USA
+
+
+.\" man code generated by txt2tags 2.3 (http://txt2tags.sf.net)
+.\" cmdline: txt2tags -t man aria2c.t2t
+

doc/aria2c.t2t

@@ -0,0 +1,222 @@
+ARIA2C
+aria2 0.8.1
+October 2006
+
+= NAME =
+aria2c - The high speed download utility
+
+= SYNOPSIS =
+
+| aria2c [//options//] //URL// ...
+| aria2c [//options//] **-T** //TORRENT_FILE FILE// ...
+| aria2c [//options//] **-M** //METALINK_FILE//
+= DESCRIPTION =
+aria2 is a utility for downloading files. It has completely new design
+concept from its predecessor, Aria, and is written from scratch.
+aria2 has a segmented downloading engine in its core.
+It can download one file from multiple URLs or multiple connections from one
+URL. This results in very high speed downloading, much faster than ordinary
+browsers. This engine in was implemented in a single-thread model.
+The architecture is clean and easy to extend. aria2 currently supports HTTP,
+FTP, and BitTorrent. It also supports Metalink version 3.0.
+
+Please visit the project web site at //""http://aria2.sourceforge.net""//.
+
+= OPTIONS =
+: **-d**, **--dir**=//DIR//
+The directory to store downloaded file.
+
+: **-o**, **--out**=//FILE//
+The file name for downloaded file.
+
+: **-l**, **--log**=//LOG//
+The file path to store log. If '-' is specified,
+log is written to stdout.
+
+: **-D**, **--daemon**
+Run as daemon.
+
+: **-s**, **--split**=//N//
+Download a file using //N// connections. //N// must be
+between 1 and 5. This option affects all URLs.
+Thus, aria2 connects to each URL with
+//N// connections.
+
+: **--retry-wait**=//SEC//
+Set amount of time in second between requests
+for errors. Specify a value between 0 and 60.
+Default: 5
+
+: **-t**, **--timeout**=//SEC//
+Set timeout in second. Default: 60
+
+: **-m**, **--max-tries**=//N//
+Set number of tries. 0 means unlimited.
+Default: 5
+
+: **--http-proxy**=//HOST//://PORT//
+Use HTTP proxy server. This affects to all
+URLs.
+
+: **--http-user**=//USER//
+Set HTTP user. This affects to all URLs.
+
+: **--http-passwd**=//PASSWD//
+Set HTTP password. This affects to all URLs.
+
+: **--http-proxy-user**=//USER//
+Set HTTP proxy user. This affects to all URLs
+
+: **--http-proxy-passwd**=//PASSWD//
+Set HTTP proxy password. This affects to all URLs.
+
+: **--http-proxy-method**=//METHOD//
+Set the method to use in proxy request.
+//METHOD// is either 'get' or 'tunnel'.
+Default: tunnel
+
+: **--http-auth-scheme**=//SCHEME//
+Set HTTP authentication scheme. Currently, basic
+is the only supported scheme.
+Default: basic
+
+: **--referer**=//REFERER//
+Set Referer. This affects to all URLs.
+
+: **--ftp-user**=//USER//
+Set FTP user. This affects to all URLs.
+                              Default: anonymous
+: **--ftp-passwd**=//PASSWD//
+Set FTP password. This affects to all URLs.
+Default: ARIA2USER@
+
+: **--ftp-type**=//TYPE//
+Set FTP transfer type. TYPE is either 'binary'
+or 'ascii'.
+Default: binary
+
+: **-p**, **--ftp-pasv**
+Use passive mode in FTP.
+
+: **--ftp-via-http-proxy**=//METHOD//
+Use HTTP proxy in FTP. //METHOD// is either 'get' or
+'tunnel'.
+Default: tunnel
+
+: **--lowest-speed-limit**=//SPEED//
+Close connection if download speed is lower than
+or equal to this value(bytes per sec).
+0 means aria2 does not care lowest speed limit.
+You can append K or M(1K = 1024, 1M = 1024K).
+This option does not affect BitTorrent download.
+Default: 0
+
+: **--max-download-limit**=//SPEED//
+Set max download speed in bytes per sec.
+0 means unrestricted.
+You can append K or M(1K = 1024, 1M = 1024K).
+Default: 0
+
+: **-T**, **--torrent-file**=//TORRENT_FILE//
+The file path to .torrent file.
+
+: **--follow-torrent**=true|false
+Setting this option to false prevents aria2 to
+enter BitTorrent mode even if the filename of
+downloaded file ends with .torrent.
+Default: true
+
+: **-S**, **--show-files**
+Print file listing of .torrent file and exit.
+
+: **--direct-file-mapping**=true|false
+Directly read from and write to each file
+mentioned in .torrent file.
+Default: true
+
+: **--listen-port**=//PORT//
+Set port number to listen to for peer connection.
+
+: **--max-upload-limit**=//SPEED//
+Set max upload speed in bytes per sec.
+0 means unrestricted.
+You can append K or M(1K = 1024, 1M = 1024K).
+Default: 0
+
+: **--select-file**=//INDEX//...
+Set file to download by specifing its index.
+You can know file index through **--show-files**
+option. Multiple indexes can be specified by using
+',' like "3,6".
+You can also use '-' to specify rangelike "1-5".
+',' and '-' can be used together.
+
+: **--seed-time**=//MINUTES//
+Specify seeding time in minutes. See also
+**--seed-ratio** option.
+
+: **--seed-ratio**=//RATIO//
+Specify share ratio. Seed completed torrents until
+share ratio reaches RATIO. 1.0 is encouraged.
+If **--seed-time** option is specified along with
+this option, seeding ends when at least one of
+the conditions is satisfied.
+
+: **-M**, **--metalink-file**=//METALINK_FILE//
+The file path to .metalink file.
+
+: **-C**, **--metalink-servers**=//NUM_SERVERS//
+The number of servers to connect to
+simultaneously. If more than one connection per
+server is required, use **-s** option.
+Default: 15
+
+: **--metalink-version**=//VERSION//
+The version of file to download.
+
+: **--metalink-language**=//LANGUAGE//
+The language of file to download.
+
+: **--metalink-os**=//OS//
+The operating system the file is targeted.
+
+: **--follow-metalink**=true|false
+Setting this option to false prevents aria2 to
+enter Metalink mode even if the filename of
+downloaded file ends with .metalink.
+Default: true
+
+: **-v**, **--version**
+Print the version number and exit.
+
+: **-h**, **--help**
+Print this message and exit.
+
+: //URL//
+You can specify multiple URLs. All URLs must point to the same file
+or downloading fails.
+
+: //FILE//
+Specify files in multi-file torrent to download. Use conjunction with
+**-T** option. This arguments are ignored if you specify **--select-file** option.
+
+
+= REPORTING BUGS =
+Report bugs to <tujikawa at users dot sourceforge dot net>
+
+= COPYRIGHT =
+Copyright (C) 2006 Tatsuhiro Tsujikawa
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

po/Makefile.in

@@ -9,7 +9,7 @@
 # General Public License and is *not* in the public domain.
 
 PACKAGE = aria2c
-VERSION = 0.8.0
+VERSION = 0.8.1
 
 SHELL = /bin/sh
 

po/aria2c.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2006-09-23 21:15+0900\n"
+"POT-Creation-Date: 2006-10-01 22:14+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -16,11 +16,11 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/TorrentMan.cc:667
+#: src/TorrentMan.cc:678
 msgid "Download of selected files was complete."
 msgstr ""
 
-#: src/TorrentMan.cc:670
+#: src/TorrentMan.cc:681
 msgid "The download was complete."
 msgstr ""
 
@@ -392,7 +392,8 @@ msgid ""
 "\n"
 "You should have received a copy of the GNU General Public License\n"
 "along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  "
+"USA\n"
 msgstr ""
 
 #: src/main.cc:108
@@ -544,7 +545,7 @@ msgstr ""
 
 #: src/main.cc:168
 msgid ""
-" --lowest-speed-limit         Close connection if download speed is lower "
+" --lowest-speed-limit=SPEED   Close connection if download speed is lower "
 "than\n"
 "                              or equal to this value(bytes per sec).\n"
 "                              0 means aria2 does not care lowest speed "
@@ -557,7 +558,7 @@ msgstr ""
 
 #: src/main.cc:175
 msgid ""
-" --max-download-limit         Set max download speed in bytes per sec.\n"
+" --max-download-limit=SPEED   Set max download speed in bytes per sec.\n"
 "                              0 means unrestricted.\n"
 "                              You can append K or M(1K = 1024, 1M = 1024K).\n"
 "                              Default: 0"
@@ -596,7 +597,7 @@ msgstr ""
 
 #: src/main.cc:190
 msgid ""
-" --max-upload-limit           Set max upload speed in bytes per sec.\n"
+" --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
 "                              0 means unrestricted.\n"
 "                              You can append K or M(1K = 1024, 1M = 1024K).\n"
 "                              Default: 0"

po/de.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2006-09-23 21:15+0900\n"
+"POT-Creation-Date: 2006-10-01 22:14+0900\n"
 "PO-Revision-Date: 2006-05-05 19:44+0900\n"
 "Last-Translator: Hermann J. Beckers <[email protected]>\n"
 "Language-Team: deutsch <[email protected]>\n"
@@ -16,12 +16,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: src/TorrentMan.cc:667
+#: src/TorrentMan.cc:678
 #, fuzzy
 msgid "Download of selected files was complete."
 msgstr " Nur ausgewählte Dateien abrufen:"
 
-#: src/TorrentMan.cc:670
+#: src/TorrentMan.cc:681
 #, fuzzy
 msgid "The download was complete."
 msgstr ""
@@ -399,6 +399,7 @@ msgid " version "
 msgstr " Version "
 
 #: src/main.cc:94
+#, fuzzy
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -412,7 +413,8 @@ msgid ""
 "\n"
 "You should have received a copy of the GNU General Public License\n"
 "along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  "
+"USA\n"
 msgstr ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -627,7 +629,7 @@ msgstr ""
 #: src/main.cc:168
 #, fuzzy
 msgid ""
-" --lowest-speed-limit         Close connection if download speed is lower "
+" --lowest-speed-limit=SPEED   Close connection if download speed is lower "
 "than\n"
 "                              or equal to this value(bytes per sec).\n"
 "                              0 means aria2 does not care lowest speed "
@@ -646,7 +648,7 @@ msgstr ""
 #: src/main.cc:175
 #, fuzzy
 msgid ""
-" --max-download-limit         Set max download speed in bytes per sec.\n"
+" --max-download-limit=SPEED   Set max download speed in bytes per sec.\n"
 "                              0 means unrestricted.\n"
 "                              You can append K or M(1K = 1024, 1M = 1024K).\n"
 "                              Default: 0"
@@ -704,7 +706,7 @@ msgstr ""
 #: src/main.cc:190
 #, fuzzy
 msgid ""
-" --max-upload-limit           Set max upload speed in bytes per sec.\n"
+" --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
 "                              0 means unrestricted.\n"
 "                              You can append K or M(1K = 1024, 1M = 1024K).\n"
 "                              Default: 0"

po/ja.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: aria2c 0.2.1\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2006-09-23 21:15+0900\n"
-"PO-Revision-Date: 2006-09-23 21:16+0900\n"
+"POT-Creation-Date: 2006-10-01 22:14+0900\n"
+"PO-Revision-Date: 2006-10-01 22:31+0900\n"
 "Last-Translator: Tatsuhiro Tsujikawa <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -16,11 +16,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/TorrentMan.cc:667
+#: src/TorrentMan.cc:678
 msgid "Download of selected files was complete."
 msgstr "ご指定のファイルのダウンロードが完了."
 
-#: src/TorrentMan.cc:670
+#: src/TorrentMan.cc:681
 msgid "The download was complete."
 msgstr "ダウンロードが完了."
 
@@ -413,7 +413,8 @@ msgid ""
 "\n"
 "You should have received a copy of the GNU General Public License\n"
 "along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  "
+"USA\n"
 msgstr ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -427,7 +428,7 @@ msgstr ""
 "\n"
 "You should have received a copy of the GNU General Public License\n"
 "along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA\n"
 
 #: src/main.cc:108
 #, c-format
@@ -647,7 +648,7 @@ msgstr ""
 
 #: src/main.cc:168
 msgid ""
-" --lowest-speed-limit         Close connection if download speed is lower "
+" --lowest-speed-limit=SPEED   Close connection if download speed is lower "
 "than\n"
 "                              or equal to this value(bytes per sec).\n"
 "                              0 means aria2 does not care lowest speed "
@@ -657,7 +658,7 @@ msgid ""
 "download.\n"
 "                              Default: 0"
 msgstr ""
-" --lowest-speed-limit         ここで指定するダウンロード速度を下回った場合, ダ\n"
+" --lowest-speed-limit=SPEED   ここで指定するダウンロード速度を下回った場合, ダ\n"
 "                              ウンロードを中止します. 速度はバイト/秒です.\n"
 "                              0 を指定すると, 速度の判定を行いません.\n"
 "                              K または M を付加することができます (1K = 1024,\n"
@@ -667,17 +668,14 @@ msgstr ""
 
 #: src/main.cc:175
 msgid ""
-" --max-download-limit         Set max download speed in bytes per sec.\n"
+" --max-download-limit=SPEED   Set max download speed in bytes per sec.\n"
 "                              0 means unrestricted.\n"
 "                              You can append K or M(1K = 1024, 1M = 1024K).\n"
 "                              Default: 0"
 msgstr ""
-" --max-download-limit         ダウンロードの最大速度 (バイト/秒) を指定しま"
-"す.\n"
-"                              0 を指定すると速度の制限をしません. K または M"
-"を\n"
-"                              付加することができます (1K = 1024, 1M = "
-"1024K).\n"
+" --max-download-limit=SPEED   ダウンロードの最大速度 (バイト/秒) を指定します.\n"
+"                              0 を指定すると速度の制限をしません. K または Mを\n"
+"                              付加することができます (1K = 1024, 1M = 1024K).\n"
 "                              デフォルト値: 0"
 
 #: src/main.cc:180
@@ -727,17 +725,14 @@ msgstr ""
 
 #: src/main.cc:190
 msgid ""
-" --max-upload-limit           Set max upload speed in bytes per sec.\n"
+" --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
 "                              0 means unrestricted.\n"
 "                              You can append K or M(1K = 1024, 1M = 1024K).\n"
 "                              Default: 0"
 msgstr ""
-" --max-upload-limit           アップロードの最大速度 (バイト/秒) を指定しま"
-"す.\n"
-"                              0 を指定すると速度の制限をしません. K または M"
-"を\n"
-"                              付加することができます (1K = 1024, 1M = "
-"1024K).\n"
+" --max-upload-limit=SPEED     アップロードの最大速度 (バイト/秒) を指定します.\n"
+"                              0 を指定すると速度の制限をしません. K または Mを\n"
+"                              付加することができます (1K = 1024, 1M = 1024K).\n"
 "                              デフォルト値: 0"
 
 #: src/main.cc:194

po/ru.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
-"POT-Creation-Date: 2006-09-23 21:15+0900\n"
+"POT-Creation-Date: 2006-10-01 22:14+0900\n"
 "PO-Revision-Date: 2006-07-28 18:04+0600\n"
 "Last-Translator: Azamat H. Hackimov <[email protected]>\n"
 "Language-Team:  <[email protected]>\n"
@@ -21,12 +21,12 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: src/TorrentMan.cc:667
+#: src/TorrentMan.cc:678
 #, fuzzy
 msgid "Download of selected files was complete."
 msgstr " Скачать только выбранные файлы:"
 
-#: src/TorrentMan.cc:670
+#: src/TorrentMan.cc:681
 #, fuzzy
 msgid "The download was complete."
 msgstr ""
@@ -401,6 +401,7 @@ msgid " version "
 msgstr " версия "
 
 #: src/main.cc:94
+#, fuzzy
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -414,7 +415,8 @@ msgid ""
 "\n"
 "You should have received a copy of the GNU General Public License\n"
 "along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  "
+"USA\n"
 msgstr ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -627,7 +629,7 @@ msgstr ""
 #: src/main.cc:168
 #, fuzzy
 msgid ""
-" --lowest-speed-limit         Close connection if download speed is lower "
+" --lowest-speed-limit=SPEED   Close connection if download speed is lower "
 "than\n"
 "                              or equal to this value(bytes per sec).\n"
 "                              0 means aria2 does not care lowest speed "
@@ -645,7 +647,7 @@ msgstr ""
 #: src/main.cc:175
 #, fuzzy
 msgid ""
-" --max-download-limit         Set max download speed in bytes per sec.\n"
+" --max-download-limit=SPEED   Set max download speed in bytes per sec.\n"
 "                              0 means unrestricted.\n"
 "                              You can append K or M(1K = 1024, 1M = 1024K).\n"
 "                              Default: 0"
@@ -699,7 +701,7 @@ msgstr ""
 #: src/main.cc:190
 #, fuzzy
 msgid ""
-" --max-upload-limit           Set max upload speed in bytes per sec.\n"
+" --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
 "                              0 means unrestricted.\n"
 "                              You can append K or M(1K = 1024, 1M = 1024K).\n"
 "                              Default: 0"

src/FtpInitiateConnectionCommand.cc

@@ -46,6 +46,7 @@ FtpInitiateConnectionCommand::FtpInitiateConnectionCommand(int cuid,
 							   DownloadEngine* e)
   :AbstractCommand(cuid, req, e)
 {
+  setTimeout(e->option->getAsInt(PREF_DNS_TIMEOUT));
   disableReadCheckSocket();
   disableWriteCheckSocket();
 }

src/HttpInitiateConnectionCommand.cc

@@ -46,6 +46,7 @@ HttpInitiateConnectionCommand::HttpInitiateConnectionCommand(int cuid,
 							     DownloadEngine* e):
   AbstractCommand(cuid, req, e)
 {
+  setTimeout(e->option->getAsInt(PREF_DNS_TIMEOUT));
   disableReadCheckSocket();
   disableWriteCheckSocket();
 }

src/main.cc

@@ -103,7 +103,7 @@ void showVersion() {
       "\n"
       "You should have received a copy of the GNU General Public License\n"
       "along with this program; if not, write to the Free Software\n"
-      "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n");
+      "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA\n");
   cout << endl;
   printf(_("Contact Info: %s\n"), "Tasuhiro Tsujikawa <tujikawa at users dot sourceforge dot net>");
   cout << endl;
@@ -165,14 +165,14 @@ void showUsage() {
   cout << _(" --ftp-via-http-proxy=METHOD  Use HTTP proxy in FTP. METHOD is either 'get' or\n"
 	    "                              'tunnel'.\n"
 	    "                              Default: tunnel") << endl;
-  cout << _(" --lowest-speed-limit         Close connection if download speed is lower than\n"
+  cout << _(" --lowest-speed-limit=SPEED   Close connection if download speed is lower than\n"
 	    "                              or equal to this value(bytes per sec).\n"
 	    "                              0 means aria2 does not care lowest speed limit.\n"
 	    "                              You can append K or M(1K = 1024, 1M = 1024K).\n"
 
 	    "                              This option does not affect BitTorrent download.\n"
 	    "                              Default: 0") << endl;
-  cout << _(" --max-download-limit         Set max download speed in bytes per sec.\n"
+  cout << _(" --max-download-limit=SPEED   Set max download speed in bytes per sec.\n"
 	    "                              0 means unrestricted.\n"
 	    "                              You can append K or M(1K = 1024, 1M = 1024K).\n"
 	    "                              Default: 0") << endl;
@@ -187,7 +187,7 @@ void showUsage() {
 	    "                              mentioned in .torrent file.\n"
 	    "                              Default: true") << endl;
   cout << _(" --listen-port=PORT           Set port number to listen to for peer connection.") << endl;
-  cout << _(" --max-upload-limit           Set max upload speed in bytes per sec.\n"
+  cout << _(" --max-upload-limit=SPEED     Set max upload speed in bytes per sec.\n"
 	    "                              0 means unrestricted.\n"
 	    "                              You can append K or M(1K = 1024, 1M = 1024K).\n"
 	    "                              Default: 0") << endl;
@@ -316,6 +316,7 @@ int main(int argc, char* argv[]) {
 	  );
   op->put(PREF_RETRY_WAIT, "5");
   op->put(PREF_TIMEOUT, "60");
+  op->put(PREF_DNS_TIMEOUT, "10");
   op->put(PREF_PEER_CONNECTION_TIMEOUT, "60");
   op->put(PREF_MIN_SEGMENT_SIZE, "1048576");// 1M
   op->put(PREF_MAX_TRIES, "5");

src/prefs.h

@@ -51,6 +51,8 @@
 // values: 1*digit
 #define PREF_TIMEOUT "timeout"
 // values: 1*digit
+#define PREF_DNS_TIMEOUT "dns_timeout"
+// values: 1*digit
 #define PREF_MAX_TRIES "max_try"
 // values: 1*digit
 #define PREF_MIN_SEGMENT_SIZE "min_segment_size"