diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2011-11-13 23:06:24 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2011-11-13 23:06:24 +0900 |
| commit | 97a9242cbe618ac3c2e3e89c30ee8018268e35a3 (patch) | |
| tree | 59f54d46282273e7986a3055b31c49e1514dbff5 /src/OptionHandlerFactory.cc | |
| parent | c42dd7e75539754f34269c46ad7673881ddbbf0d (diff) | |
Proxy URI is now constructed in getProxyUri().
The previous implementation constructs proxy URI in OptionHandler but
it cannot handle with the situation when user, password and proxy URI
is given various order. Now we just set rules: username set in
--*-proxy-user overrides username in --*-proxy option, no matter in
any order username, password and proxy URI are parsed. Likewise,
password set in --*--proxy-passwd overrides password in --*-proxy
option.
Diffstat (limited to 'src/OptionHandlerFactory.cc')
| -rw-r--r-- | src/OptionHandlerFactory.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/OptionHandlerFactory.cc b/src/OptionHandlerFactory.cc index a2e02b45..65277520 100644 --- a/src/OptionHandlerFactory.cc +++ b/src/OptionHandlerFactory.cc @@ -1306,7 +1306,7 @@ OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - SharedHandle<OptionHandler> op(new HttpProxyPasswdOptionHandler + SharedHandle<OptionHandler> op(new DefaultOptionHandler (PREF_HTTP_PROXY_PASSWD, TEXT_HTTP_PROXY_PASSWD, NO_DEFAULT_VALUE)); @@ -1318,7 +1318,7 @@ OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - SharedHandle<OptionHandler> op(new HttpProxyUserOptionHandler + SharedHandle<OptionHandler> op(new DefaultOptionHandler (PREF_HTTP_PROXY_USER, TEXT_HTTP_PROXY_USER, NO_DEFAULT_VALUE)); @@ -1342,7 +1342,7 @@ OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - SharedHandle<OptionHandler> op(new HttpProxyPasswdOptionHandler + SharedHandle<OptionHandler> op(new DefaultOptionHandler (PREF_HTTPS_PROXY_PASSWD, TEXT_HTTPS_PROXY_PASSWD, NO_DEFAULT_VALUE)); @@ -1355,7 +1355,7 @@ OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - SharedHandle<OptionHandler> op(new HttpProxyUserOptionHandler + SharedHandle<OptionHandler> op(new DefaultOptionHandler (PREF_HTTPS_PROXY_USER, TEXT_HTTPS_PROXY_USER, NO_DEFAULT_VALUE)); @@ -1379,7 +1379,7 @@ OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - SharedHandle<OptionHandler> op(new HttpProxyPasswdOptionHandler + SharedHandle<OptionHandler> op(new DefaultOptionHandler (PREF_FTP_PROXY_PASSWD, TEXT_FTP_PROXY_PASSWD, NO_DEFAULT_VALUE)); @@ -1391,7 +1391,7 @@ OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - SharedHandle<OptionHandler> op(new HttpProxyUserOptionHandler + SharedHandle<OptionHandler> op(new DefaultOptionHandler (PREF_FTP_PROXY_USER, TEXT_FTP_PROXY_USER, NO_DEFAULT_VALUE)); @@ -1416,7 +1416,7 @@ OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - SharedHandle<OptionHandler> op(new HttpProxyPasswdOptionHandler + SharedHandle<OptionHandler> op(new DefaultOptionHandler (PREF_ALL_PROXY_PASSWD, TEXT_ALL_PROXY_PASSWD, NO_DEFAULT_VALUE)); @@ -1430,7 +1430,7 @@ OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - SharedHandle<OptionHandler> op(new HttpProxyUserOptionHandler + SharedHandle<OptionHandler> op(new DefaultOptionHandler (PREF_ALL_PROXY_USER, TEXT_ALL_PROXY_USER, NO_DEFAULT_VALUE)); |