diff options
| author | arindam@chromium.org <arindam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-14 05:23:30 +0000 |
|---|---|---|
| committer | arindam@chromium.org <arindam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-14 05:23:30 +0000 |
| commit | 87a102b1bd6d2e450f10ed0931c09ffcfef9a51c (patch) | |
| tree | 6877259bfdf9ec82c9952a1f66d9d450c037f331 /net/proxy/proxy_list.cc | |
| parent | 565243e032009b7022b49c085b1157c3fb4986d4 (diff) | |
| download | chromium_src-87a102b1bd6d2e450f10ed0931c09ffcfef9a51c.zip chromium_src-87a102b1bd6d2e450f10ed0931c09ffcfef9a51c.tar.gz chromium_src-87a102b1bd6d2e450f10ed0931c09ffcfef9a51c.tar.bz2 | |
Whenever proxy configurations contain socks and http/https/ftp proxies, socks configuration over rid the other proxies. Fixes the issue. Attached test cases.
BUG=15738
TEST=unittest (ProxyConfigTest.ParseProxyRules, ProxyServiceTest.DefaultProxyFallbackToSOCKS)
Review URL: http://codereview.chromium.org/149191
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20605 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_list.cc')
| -rw-r--r-- | net/proxy/proxy_list.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/proxy/proxy_list.cc b/net/proxy/proxy_list.cc index e390bbc..e12edf4 100644 --- a/net/proxy/proxy_list.cc +++ b/net/proxy/proxy_list.cc @@ -18,7 +18,7 @@ void ProxyList::Set(const std::string& proxy_uri_list) { StringTokenizer str_tok(proxy_uri_list, ";"); while (str_tok.GetNext()) { ProxyServer uri = ProxyServer::FromURI( - str_tok.token_begin(), str_tok.token_end()); + str_tok.token_begin(), str_tok.token_end(), ProxyServer::SCHEME_HTTP); // Silently discard malformed inputs. if (uri.is_valid()) proxies_.push_back(uri); |