diff options
| author | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-19 08:11:42 +0000 |
|---|---|---|
| committer | ericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-19 08:11:42 +0000 |
| commit | f6fb2de77993bbd88931ba205b0cc1e3423111f6 (patch) | |
| tree | 831dbc093048f60b7d3cfa6548d42cedc340b4d7 /net/proxy/proxy_config_service_win.cc | |
| parent | 77c846f5d8043e56543668971fff356d58380cf7 (diff) | |
| download | chromium_src-f6fb2de77993bbd88931ba205b0cc1e3423111f6.zip chromium_src-f6fb2de77993bbd88931ba205b0cc1e3423111f6.tar.gz chromium_src-f6fb2de77993bbd88931ba205b0cc1e3423111f6.tar.bz2 | |
Add parsing for PAC result strings -- ProxyInfo::UsePacString().
Added the support class ProxyServer to avoid losing the proxy server's type information (http, socks) when populating the list.
The format of the configuration strings has been extended accordingly to include an optional [<scheme>"://"] prefix.
(i.e. "http://", "socks4://", "socks5://").
Review URL: http://codereview.chromium.org/20398
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10010 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_config_service_win.cc')
| -rw-r--r-- | net/proxy/proxy_config_service_win.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/proxy/proxy_config_service_win.cc b/net/proxy/proxy_config_service_win.cc index f356ac9..9779928 100644 --- a/net/proxy/proxy_config_service_win.cc +++ b/net/proxy/proxy_config_service_win.cc @@ -34,7 +34,7 @@ int ProxyConfigServiceWin::GetProxyConfig(ProxyConfig* config) { if (ie_config.fAutoDetect) config->auto_detect = true; if (ie_config.lpszProxy) - config->proxy_server = WideToASCII(ie_config.lpszProxy); + config->proxy_rules = WideToASCII(ie_config.lpszProxy); if (ie_config.lpszProxyBypass) { std::string proxy_bypass = WideToASCII(ie_config.lpszProxyBypass); |