diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2008-11-04 14:08:26 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2008-11-04 14:08:26 +0000 |
| commit | c7fb678e6ee03f1bbfb39c820710c0bf76eb965a (patch) | |
| tree | 491b5b858a6c383ab045a43557e6b851723ee507 /src/InitiateConnectionCommand.cc | |
| parent | 223621b5bc714de0031c11e86f728890cfa1bc6c (diff) | |
2008-11-04 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
Deprecated --http-proxy-user and --http-proxy-passwd options.
Added --https-proxy, --ftp-proxy and --all-proxy options.
Above 3 options and --http-proxy option can handle proxy in URL
format like: http://user:passwd@host:port.
If a proxy requires user/password, they must be specified in a
URL.
Deprecated --ftp-via-http-proxy option. Use --http-proxy-method
option instead.
* src/AbstractCommand.cc
* src/AbstractCommand.h
* src/AbstractProxyRequestCommand.cc
* src/AbstractProxyRequestCommand.h
* src/AuthConfigFactory.cc
* src/AuthConfigFactory.h
* src/FtpFinishDownloadCommand.cc
* src/FtpInitiateConnectionCommand.cc
* src/FtpInitiateConnectionCommand.h
* src/FtpNegotiationCommand.cc
* src/FtpTunnelRequestCommand.cc
* src/FtpTunnelRequestCommand.h
* src/HttpDownloadCommand.cc
* src/HttpInitiateConnectionCommand.cc
* src/HttpInitiateConnectionCommand.h
* src/HttpProxyRequestCommand.cc
* src/HttpProxyRequestCommand.h
* src/HttpRequest.cc
* src/HttpRequest.h
* src/HttpRequestCommand.cc
* src/HttpRequestCommand.h
* src/HttpSkipResponseCommand.cc
* src/InitiateConnectionCommand.cc
* src/InitiateConnectionCommand.h
* src/OptionHandlerFactory.cc
* src/OptionHandlerImpl.h
* src/Request.cc
* src/option_processing.cc
* src/prefs.cc
* src/prefs.h
* src/usage_text.h
* test/AuthConfigFactoryTest.cc
* test/HttpRequestTest.cc
* test/OptionHandlerTest.cc
Diffstat (limited to 'src/InitiateConnectionCommand.cc')
| -rw-r--r-- | src/InitiateConnectionCommand.cc | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/InitiateConnectionCommand.cc b/src/InitiateConnectionCommand.cc index 7f56931c..512da0b1 100644 --- a/src/InitiateConnectionCommand.cc +++ b/src/InitiateConnectionCommand.cc @@ -62,10 +62,11 @@ InitiateConnectionCommand::~InitiateConnectionCommand() {} bool InitiateConnectionCommand::executeInternal() { std::string hostname; - if(useHTTPProxy()) { - hostname = e->option->get(PREF_HTTP_PROXY_HOST); - } else { + SharedHandle<Request> proxyRequest = createProxyRequest(); + if(proxyRequest.isNull()) { hostname = req->getHost(); + } else { + hostname = proxyRequest->getHost(); } std::deque<std::string> addrs; std::string ipaddr = e->findCachedIPAddress(hostname); @@ -97,14 +98,9 @@ bool InitiateConnectionCommand::executeInternal() { addrs.push_back(ipaddr); } - Command* command = createNextCommand(addrs); + Command* command = createNextCommand(addrs, proxyRequest); e->commands.push_back(command); return true; } -bool InitiateConnectionCommand::useHTTPProxy() const -{ - return e->option->getAsBool(PREF_HTTP_PROXY_ENABLED); -} - } // namespace aria2 |