mirror of https://github.com/aria2/aria2
pull/1/head
Tatsuhiro Tsujikawa
parent
7db2b0596d
commit
941e0108d3
|
|
@ -1,6 +1,6 @@
|
|||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.59 for aria2c 0.6.0.
|
||||
# Generated by GNU Autoconf 2.59 for aria2c 0.6.1.
|
||||
#
|
||||
# Report bugs to <tujikawa@rednoah.com>.
|
||||
#
|
||||
|
|
@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
|
|||
# Identity of this package.
|
||||
PACKAGE_NAME='aria2c'
|
||||
PACKAGE_TARNAME='aria2c'
|
||||
PACKAGE_VERSION='0.6.0'
|
||||
PACKAGE_STRING='aria2c 0.6.0'
|
||||
PACKAGE_VERSION='0.6.1'
|
||||
PACKAGE_STRING='aria2c 0.6.1'
|
||||
PACKAGE_BUGREPORT='tujikawa@rednoah.com'
|
||||
|
||||
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.6.0 to adapt to many kinds of systems.
|
||||
\`configure' configures aria2c 0.6.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.6.0:";;
|
||||
short | recursive ) echo "Configuration of aria2c 0.6.1:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
|
|
@ -1000,7 +1000,7 @@ fi
|
|||
test -n "$ac_init_help" && exit 0
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
aria2c configure 0.6.0
|
||||
aria2c configure 0.6.1
|
||||
generated by GNU Autoconf 2.59
|
||||
|
||||
Copyright (C) 2003 Free Software Foundation, Inc.
|
||||
|
|
@ -1014,7 +1014,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.6.0, which was
|
||||
It was created by aria2c $as_me 0.6.1, which was
|
||||
generated by GNU Autoconf 2.59. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
|
|
@ -1657,7 +1657,7 @@ fi
|
|||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='aria2c'
|
||||
VERSION='0.6.0'
|
||||
VERSION='0.6.1'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
|
|
@ -11943,7 +11943,7 @@ _ASBOX
|
|||
} >&5
|
||||
cat >&5 <<_CSEOF
|
||||
|
||||
This file was extended by aria2c $as_me 0.6.0, which was
|
||||
This file was extended by aria2c $as_me 0.6.1, which was
|
||||
generated by GNU Autoconf 2.59. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
|
|
@ -12006,7 +12006,7 @@ _ACEOF
|
|||
|
||||
cat >>$CONFIG_STATUS <<_ACEOF
|
||||
ac_cs_version="\\
|
||||
aria2c config.status 0.6.0
|
||||
aria2c config.status 0.6.1
|
||||
configured by $0, generated by GNU Autoconf 2.59,
|
||||
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Process this file with autoconf to produce a configure script.
|
||||
#
|
||||
AC_PREREQ(2.59)
|
||||
AC_INIT(aria2c, 0.6.0, tujikawa@rednoah.com)
|
||||
AC_INIT(aria2c, 0.6.1, tujikawa@rednoah.com)
|
||||
AM_INIT_AUTOMAKE()
|
||||
AM_PATH_CPPUNIT(1.10.2)
|
||||
AC_CONFIG_SRCDIR([src/Socket.h])
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
# General Public License and is *not* in the public domain.
|
||||
|
||||
PACKAGE = aria2c
|
||||
VERSION = 0.6.0
|
||||
VERSION = 0.6.1
|
||||
|
||||
SHELL = /bin/sh
|
||||
|
||||
|
|
|
|||
|
|
@ -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-07-04 20:44+0900\n"
|
||||
"POT-Creation-Date: 2006-07-21 00:57+0900\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -692,82 +692,82 @@ msgstr ""
|
|||
msgid "Report bugs to %s"
|
||||
msgstr ""
|
||||
|
||||
#: src/main.cc:444
|
||||
#: src/main.cc:446
|
||||
msgid "unrecognized proxy format"
|
||||
msgstr ""
|
||||
|
||||
#: src/main.cc:471
|
||||
#: src/main.cc:473
|
||||
msgid "Currently, supported authentication scheme is basic."
|
||||
msgstr ""
|
||||
|
||||
#: src/main.cc:480
|
||||
#: src/main.cc:482
|
||||
msgid "retry-wait must be between 0 and 60."
|
||||
msgstr ""
|
||||
|
||||
#: src/main.cc:497
|
||||
#: src/main.cc:499
|
||||
msgid "ftp-type must be either 'binary' or 'ascii'."
|
||||
msgstr ""
|
||||
|
||||
#: src/main.cc:506
|
||||
#: src/main.cc:508
|
||||
msgid "ftp-via-http-proxy must be either 'get' or 'tunnel'."
|
||||
msgstr ""
|
||||
|
||||
#: src/main.cc:524
|
||||
#: src/main.cc:526
|
||||
msgid "min-segment-size invalid"
|
||||
msgstr ""
|
||||
|
||||
#: src/main.cc:535
|
||||
#: src/main.cc:537
|
||||
msgid "http-proxy-method must be either 'get' or 'tunnel'."
|
||||
msgstr ""
|
||||
|
||||
#: src/main.cc:543
|
||||
#: src/main.cc:545
|
||||
msgid "listen-port must be between 1024 and 65535."
|
||||
msgstr ""
|
||||
|
||||
#: src/main.cc:554
|
||||
#: src/main.cc:556
|
||||
msgid "follow-torrent must be either 'true' or 'false'."
|
||||
msgstr ""
|
||||
|
||||
#: src/main.cc:568
|
||||
#: src/main.cc:570
|
||||
msgid "direct-file-mapping must be either 'true' or 'false'."
|
||||
msgstr ""
|
||||
|
||||
#: src/main.cc:576
|
||||
#: src/main.cc:578
|
||||
msgid "upload-limit must be greater than or equal to 0."
|
||||
msgstr ""
|
||||
|
||||
#: src/main.cc:601
|
||||
#: src/main.cc:603
|
||||
msgid "follow-metalink must be either 'true' or 'false'."
|
||||
msgstr ""
|
||||
|
||||
#: src/main.cc:628
|
||||
#: src/main.cc:630
|
||||
msgid "split must be between 1 and 5."
|
||||
msgstr ""
|
||||
|
||||
#: src/main.cc:638
|
||||
#: src/main.cc:640
|
||||
msgid "timeout must be between 1 and 600"
|
||||
msgstr ""
|
||||
|
||||
#: src/main.cc:647
|
||||
#: src/main.cc:649
|
||||
msgid "max-tries invalid"
|
||||
msgstr ""
|
||||
|
||||
#: src/main.cc:669
|
||||
#: src/main.cc:671
|
||||
msgid "metalink-servers must be greater than 0."
|
||||
msgstr ""
|
||||
|
||||
#: src/main.cc:687
|
||||
#: src/main.cc:689
|
||||
msgid "specify at least one URL"
|
||||
msgstr ""
|
||||
|
||||
#: src/main.cc:694
|
||||
#: src/main.cc:696
|
||||
msgid "daemon failed"
|
||||
msgstr ""
|
||||
|
||||
#: src/main.cc:833
|
||||
#: src/main.cc:837
|
||||
msgid "Files:"
|
||||
msgstr ""
|
||||
|
||||
#: src/main.cc:864
|
||||
#: src/main.cc:868
|
||||
msgid "Errors occurred while binding port.\n"
|
||||
msgstr ""
|
||||
|
|
|
|||
42
po/de.po
42
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-07-04 20:44+0900\n"
|
||||
"POT-Creation-Date: 2006-07-21 00:57+0900\n"
|
||||
"PO-Revision-Date: 2006-05-05 19:44+0900\n"
|
||||
"Last-Translator: Hermann J. Beckers <hj.beckers@onlinehome.de>\n"
|
||||
"Language-Team: deutsch <de@li.org>\n"
|
||||
|
|
@ -824,84 +824,84 @@ msgstr ""
|
|||
msgid "Report bugs to %s"
|
||||
msgstr "Fehler an %s melden"
|
||||
|
||||
#: src/main.cc:444
|
||||
#: src/main.cc:446
|
||||
msgid "unrecognized proxy format"
|
||||
msgstr "nicht erkanntes Proxy-Format"
|
||||
|
||||
#: src/main.cc:471
|
||||
#: src/main.cc:473
|
||||
msgid "Currently, supported authentication scheme is basic."
|
||||
msgstr "Derzeit unterstütztes Authentifizierungsschema ist basic."
|
||||
|
||||
#: src/main.cc:480
|
||||
#: src/main.cc:482
|
||||
msgid "retry-wait must be between 0 and 60."
|
||||
msgstr "retry-wait muss zwischen 0 und 60 liegen."
|
||||
|
||||
#: src/main.cc:497
|
||||
#: src/main.cc:499
|
||||
msgid "ftp-type must be either 'binary' or 'ascii'."
|
||||
msgstr "ftp-type muss entweder 'binary' oder 'ascii' sein."
|
||||
|
||||
#: src/main.cc:506
|
||||
#: src/main.cc:508
|
||||
msgid "ftp-via-http-proxy must be either 'get' or 'tunnel'."
|
||||
msgstr "ftp-via-http-proxy muss entweder 'get' oder 'tunnel' sein."
|
||||
|
||||
#: src/main.cc:524
|
||||
#: src/main.cc:526
|
||||
msgid "min-segment-size invalid"
|
||||
msgstr "min-segment-size ungültig"
|
||||
|
||||
#: src/main.cc:535
|
||||
#: src/main.cc:537
|
||||
msgid "http-proxy-method must be either 'get' or 'tunnel'."
|
||||
msgstr "http-proxy-method muss entweder 'get' oder 'tunnel' sein."
|
||||
|
||||
#: src/main.cc:543
|
||||
#: src/main.cc:545
|
||||
msgid "listen-port must be between 1024 and 65535."
|
||||
msgstr "listen-port muss zwischen 1024 und 65535 liegen."
|
||||
|
||||
#: src/main.cc:554
|
||||
#: src/main.cc:556
|
||||
msgid "follow-torrent must be either 'true' or 'false'."
|
||||
msgstr "follow-torrent muss entweder 'true' oder 'false' sein."
|
||||
|
||||
#: src/main.cc:568
|
||||
#: src/main.cc:570
|
||||
msgid "direct-file-mapping must be either 'true' or 'false'."
|
||||
msgstr "direct-file-mapping muss entweder 'true' oder 'false' sein."
|
||||
|
||||
#: src/main.cc:576
|
||||
#: src/main.cc:578
|
||||
msgid "upload-limit must be greater than or equal to 0."
|
||||
msgstr "upload-limit muss größer oder gleich 0 sein."
|
||||
|
||||
#: src/main.cc:601
|
||||
#: src/main.cc:603
|
||||
#, fuzzy
|
||||
msgid "follow-metalink must be either 'true' or 'false'."
|
||||
msgstr "follow-torrent muss entweder 'true' oder 'false' sein."
|
||||
|
||||
#: src/main.cc:628
|
||||
#: src/main.cc:630
|
||||
msgid "split must be between 1 and 5."
|
||||
msgstr "split muss zwischen 1 und 5 liegen."
|
||||
|
||||
#: src/main.cc:638
|
||||
#: src/main.cc:640
|
||||
msgid "timeout must be between 1 and 600"
|
||||
msgstr "timeout muss zwischen 1 und 600 liegen."
|
||||
|
||||
#: src/main.cc:647
|
||||
#: src/main.cc:649
|
||||
msgid "max-tries invalid"
|
||||
msgstr "max-tries ungültig"
|
||||
|
||||
#: src/main.cc:669
|
||||
#: src/main.cc:671
|
||||
#, fuzzy
|
||||
msgid "metalink-servers must be greater than 0."
|
||||
msgstr "upload-limit muss größer oder gleich 0 sein."
|
||||
|
||||
#: src/main.cc:687
|
||||
#: src/main.cc:689
|
||||
msgid "specify at least one URL"
|
||||
msgstr "Geben Sie zumindest eine URL an"
|
||||
|
||||
#: src/main.cc:694
|
||||
#: src/main.cc:696
|
||||
msgid "daemon failed"
|
||||
msgstr "Daemon-Start nicht erfolgreich"
|
||||
|
||||
#: src/main.cc:833
|
||||
#: src/main.cc:837
|
||||
msgid "Files:"
|
||||
msgstr "Dateien:"
|
||||
|
||||
#: src/main.cc:864
|
||||
#: src/main.cc:868
|
||||
msgid "Errors occurred while binding port.\n"
|
||||
msgstr "Fehler beim Binden an Port aufgetreten.\n"
|
||||
|
|
|
|||
42
po/ja.po
42
po/ja.po
|
|
@ -7,7 +7,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: aria2c 0.2.1\n"
|
||||
"Report-Msgid-Bugs-To: http://aria2.sourceforge.net/\n"
|
||||
"POT-Creation-Date: 2006-07-04 20:44+0900\n"
|
||||
"POT-Creation-Date: 2006-07-21 00:57+0900\n"
|
||||
"PO-Revision-Date: 2006-07-04 01:41+0900\n"
|
||||
"Last-Translator: Tatsuhiro Tsujikawa <tujikawa@rednoah.com>\n"
|
||||
"Language-Team: Japanese <ja@li.org>\n"
|
||||
|
|
@ -848,82 +848,82 @@ msgstr "
|
|||
msgid "Report bugs to %s"
|
||||
msgstr "バグレポートはこちらへ: %s"
|
||||
|
||||
#: src/main.cc:444
|
||||
#: src/main.cc:446
|
||||
msgid "unrecognized proxy format"
|
||||
msgstr "理解できないProxyフォーマットです."
|
||||
|
||||
#: src/main.cc:471
|
||||
#: src/main.cc:473
|
||||
msgid "Currently, supported authentication scheme is basic."
|
||||
msgstr "現在サポートされている認証方法は basic です."
|
||||
|
||||
#: src/main.cc:480
|
||||
#: src/main.cc:482
|
||||
msgid "retry-wait must be between 0 and 60."
|
||||
msgstr "retry-wait は 0 から 60 の間で指定してください."
|
||||
|
||||
#: src/main.cc:497
|
||||
#: src/main.cc:499
|
||||
msgid "ftp-type must be either 'binary' or 'ascii'."
|
||||
msgstr "ftp-type は 'binary' または 'ascii' を指定してください."
|
||||
|
||||
#: src/main.cc:506
|
||||
#: src/main.cc:508
|
||||
msgid "ftp-via-http-proxy must be either 'get' or 'tunnel'."
|
||||
msgstr "ftp-via-http-proxy は 'get' または 'tunnel' を指定してください."
|
||||
|
||||
#: src/main.cc:524
|
||||
#: src/main.cc:526
|
||||
msgid "min-segment-size invalid"
|
||||
msgstr "min-segment-size が不正です."
|
||||
|
||||
#: src/main.cc:535
|
||||
#: src/main.cc:537
|
||||
msgid "http-proxy-method must be either 'get' or 'tunnel'."
|
||||
msgstr "http-proxy-method は 'get' または 'tunnel' を指定してください."
|
||||
|
||||
#: src/main.cc:543
|
||||
#: src/main.cc:545
|
||||
msgid "listen-port must be between 1024 and 65535."
|
||||
msgstr "listen-port は 1024 - 65535 の値を指定してください."
|
||||
|
||||
#: src/main.cc:554
|
||||
#: src/main.cc:556
|
||||
msgid "follow-torrent must be either 'true' or 'false'."
|
||||
msgstr "follow-torrent は 'true' または 'false を指定してください."
|
||||
|
||||
#: src/main.cc:568
|
||||
#: src/main.cc:570
|
||||
msgid "direct-file-mapping must be either 'true' or 'false'."
|
||||
msgstr "direct-file-mapping は 'true' または 'false を指定してください."
|
||||
|
||||
#: src/main.cc:576
|
||||
#: src/main.cc:578
|
||||
msgid "upload-limit must be greater than or equal to 0."
|
||||
msgstr "upload-limit は 0 以上の数を指定してください."
|
||||
|
||||
#: src/main.cc:601
|
||||
#: src/main.cc:603
|
||||
msgid "follow-metalink must be either 'true' or 'false'."
|
||||
msgstr "follow-metalink は 'true' または 'false を指定してください."
|
||||
|
||||
#: src/main.cc:628
|
||||
#: src/main.cc:630
|
||||
msgid "split must be between 1 and 5."
|
||||
msgstr "split は 1 - 5 の値を指定してください."
|
||||
|
||||
#: src/main.cc:638
|
||||
#: src/main.cc:640
|
||||
msgid "timeout must be between 1 and 600"
|
||||
msgstr "timeout は 1 - 600 の値を指定してください."
|
||||
|
||||
#: src/main.cc:647
|
||||
#: src/main.cc:649
|
||||
msgid "max-tries invalid"
|
||||
msgstr "max-tries が不正です."
|
||||
|
||||
#: src/main.cc:669
|
||||
#: src/main.cc:671
|
||||
msgid "metalink-servers must be greater than 0."
|
||||
msgstr "metalink-servers は 0 以上の数を指定してください."
|
||||
|
||||
#: src/main.cc:687
|
||||
#: src/main.cc:689
|
||||
msgid "specify at least one URL"
|
||||
msgstr "一個以上の URL を指定してください."
|
||||
|
||||
#: src/main.cc:694
|
||||
#: src/main.cc:696
|
||||
msgid "daemon failed"
|
||||
msgstr "デーモン起動に失敗"
|
||||
|
||||
#: src/main.cc:833
|
||||
#: src/main.cc:837
|
||||
msgid "Files:"
|
||||
msgstr "ファイル:"
|
||||
|
||||
#: src/main.cc:864
|
||||
#: src/main.cc:868
|
||||
msgid "Errors occurred while binding port.\n"
|
||||
msgstr "ポートをバインド中にエラーが発生しました.\n"
|
||||
|
|
|
|||
|
|
@ -56,10 +56,16 @@ bool Request::redirectUrl(const string& url) {
|
|||
}
|
||||
|
||||
bool Request::parseUrl(const string& url) {
|
||||
#ifdef ENABLE_METALINK
|
||||
bool metalinkEnabled = true;
|
||||
#else
|
||||
bool metalinkEnabled = false;
|
||||
#endif
|
||||
|
||||
string tempUrl;
|
||||
string::size_type sharpIndex = url.find("#");
|
||||
if(sharpIndex != string::npos) {
|
||||
if(url.find(METALINK_MARK) == sharpIndex) {
|
||||
if(metalinkEnabled && url.find(METALINK_MARK) == sharpIndex) {
|
||||
tempUrl = url.substr(sharpIndex+strlen(METALINK_MARK));
|
||||
} else {
|
||||
tempUrl = url.substr(0, sharpIndex);
|
||||
|
|
|
|||
Loading…
Reference in New Issue