diff options
| author | sdoyon@chromium.org <sdoyon@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-15 13:16:54 +0000 |
|---|---|---|
| committer | sdoyon@chromium.org <sdoyon@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-15 13:16:54 +0000 |
| commit | 62749f18844ca44d0c104ffbb3fbbaa92e9f3335 (patch) | |
| tree | c4e006c24084e5ceaa1ecd2b24d91d0bbebb05ef /net/proxy/proxy_config_service_linux.cc | |
| parent | e0c27beabdf16ead25bfba3b7db2965efef19ee1 (diff) | |
| download | chromium_src-62749f18844ca44d0c104ffbb3fbbaa92e9f3335.zip chromium_src-62749f18844ca44d0c104ffbb3fbbaa92e9f3335.tar.gz chromium_src-62749f18844ca44d0c104ffbb3fbbaa92e9f3335.tar.bz2 | |
Fix the log error message about proxy authentication in
ProxyConfigServiceLinux: the proxy auth parameters are still not
supported, but proxy auth is supported.
Also see http://crbug.com/16709
BUG=13530
TEST=none
Review URL: http://codereview.chromium.org/149614
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20725 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_config_service_linux.cc')
| -rw-r--r-- | net/proxy/proxy_config_service_linux.cc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc index a9efab2..f85e450 100644 --- a/net/proxy/proxy_config_service_linux.cc +++ b/net/proxy/proxy_config_service_linux.cc @@ -72,8 +72,10 @@ std::string FixupProxyHostScheme(ProxyServer::Scheme scheme, std::string::size_type at_sign = host.find("@"); // Should this be supported? if (at_sign != std::string::npos) { - LOG(ERROR) << "Proxy authentication not supported"; - // Disregard the authentication parameters and continue with this hostname. + // ProxyConfig does not support authentication parameters, but Chrome + // will prompt for the password later. Disregard the + // authentication parameters and continue with this hostname. + LOG(WARNING) << "Proxy authentication parameters ignored, see bug 16709"; host = host.substr(at_sign + 1); } // If this is a socks proxy, prepend a scheme so as to tell @@ -509,8 +511,12 @@ bool ProxyConfigServiceLinux::Delegate::GetConfigFromGConf( bool use_auth; gconf_getter_->GetBoolean("/system/http_proxy/use_authentication", &use_auth); - if (use_auth) - LOG(ERROR) << "Proxy authentication not supported"; + if (use_auth) { + // ProxyConfig does not support authentication parameters, but + // Chrome will prompt for the password later. So we ignore + // /system/http_proxy/*auth* settings. + LOG(WARNING) << "Proxy authentication parameters ignored, see bug 16709"; + } // Now the bypass list. gconf_getter_->GetStringList("/system/http_proxy/ignore_hosts", |