diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2008-11-09 08:23:11 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2008-11-09 08:23:11 +0000 |
| commit | 0308785bd8dc1d7ebe18d8a91fe12b16bfdd107c (patch) | |
| tree | 5e1121152b6c31a8f1d495f45daec31337056a3c /src/option_processing.cc | |
| parent | ce4186b4c3f8d78bcd77fdc93ab1cbe00e2b45e2 (diff) | |
2008-11-09 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Added --no-proxy option. It receives comman separated hostname
or domains to which proxy should not be used.
aria2 honors the environment variable no_proxy to override
no-proxy value in configuration file. The user can override the
environment variable no_proxy with --no-proxy command-line
option.
* src/AbstractCommand.cc
* src/OptionHandlerFactory.cc
* src/option_processing.cc
* src/prefs.cc
* src/prefs.h
* src/usage_text.h
Diffstat (limited to 'src/option_processing.cc')
| -rw-r--r-- | src/option_processing.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/option_processing.cc b/src/option_processing.cc index 4a1c5eca..34287f74 100644 --- a/src/option_processing.cc +++ b/src/option_processing.cc @@ -186,6 +186,7 @@ Option* option_processing(int argc, char* const argv[]) { PREF_PRIVATE_KEY.c_str(), required_argument, &lopt, 232 }, { PREF_CA_CERTIFICATE.c_str(), optional_argument, &lopt, 233 }, { PREF_CHECK_CERTIFICATE.c_str(), optional_argument, &lopt, 234 }, + { PREF_NO_PROXY.c_str(), required_argument, &lopt, 235 }, #if defined ENABLE_BITTORRENT || defined ENABLE_METALINK { PREF_SHOW_FILES.c_str(), no_argument, NULL, 'S' }, { PREF_SELECT_FILE.c_str(), required_argument, &lopt, 21 }, @@ -466,6 +467,9 @@ Option* option_processing(int argc, char* const argv[]) case 234: cmdstream << PREF_CHECK_CERTIFICATE << "=" << toBoolArg(optarg) << "\n"; break; + case 235: + cmdstream << PREF_NO_PROXY << "=" << optarg << "\n"; + break; } break; } @@ -593,6 +597,7 @@ Option* option_processing(int argc, char* const argv[]) overrideWithEnv(op, oparser, PREF_HTTPS_PROXY, "https_proxy"); overrideWithEnv(op, oparser, PREF_FTP_PROXY, "ftp_proxy"); overrideWithEnv(op, oparser, PREF_ALL_PROXY, "all_proxy"); + overrideWithEnv(op, oparser, PREF_NO_PROXY, "no_proxy"); try { oparser.parse(op, cmdstream); |