diff options
| author | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-30 18:51:16 +0000 |
|---|---|---|
| committer | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-30 18:51:16 +0000 |
| commit | 21a52557fc2373e7c3f525072384bb97f7978012 (patch) | |
| tree | 84539a3aba112abf72b88c644b791c23cdfefe93 /net/proxy/proxy_resolver_winhttp.cc | |
| parent | 074ff16d3029256a9585529cad5487c1ae6eb409 (diff) | |
| download | chromium_src-21a52557fc2373e7c3f525072384bb97f7978012.zip chromium_src-21a52557fc2373e7c3f525072384bb97f7978012.tar.gz chromium_src-21a52557fc2373e7c3f525072384bb97f7978012.tar.bz2 | |
oops; will reland once tree is open
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4223 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_resolver_winhttp.cc')
| -rw-r--r-- | net/proxy/proxy_resolver_winhttp.cc | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/net/proxy/proxy_resolver_winhttp.cc b/net/proxy/proxy_resolver_winhttp.cc index 19dd0b0..5a16df5 100644 --- a/net/proxy/proxy_resolver_winhttp.cc +++ b/net/proxy/proxy_resolver_winhttp.cc @@ -8,7 +8,6 @@ #include <winhttp.h> #include "base/histogram.h" -#include "base/string_tokenizer.h" #include "net/base/net_errors.h" #pragma comment(lib, "winhttp.lib") @@ -71,18 +70,8 @@ int ProxyResolverWinHttp::GetProxyConfig(ProxyConfig* config) { config->auto_detect = true; if (ie_config.lpszProxy) config->proxy_server = WideToASCII(ie_config.lpszProxy); - if (ie_config.lpszProxyBypass) { - std::string proxy_bypass = WideToASCII(ie_config.lpszProxyBypass); - - StringTokenizer proxy_server_bypass_list(proxy_bypass, "; \t\n\r"); - while (proxy_server_bypass_list.GetNext()) { - std::string bypass_url_domain = proxy_server_bypass_list.token(); - if (bypass_url_domain == "<local>") - config->proxy_bypass_local_names = true; - else - config->proxy_bypass.push_back(bypass_url_domain); - } - } + if (ie_config.lpszProxyBypass) + config->proxy_bypass = WideToASCII(ie_config.lpszProxyBypass); if (ie_config.lpszAutoConfigUrl) config->pac_url = WideToASCII(ie_config.lpszAutoConfigUrl); |