From 9a8b07a892223ae77e2d0cf9fd379cdb3072eee0 Mon Sep 17 00:00:00 2001 From: "eroman@chromium.org" Date: Fri, 9 Sep 2011 01:57:22 +0000 Subject: Check for kCFProxyTypeHttps in ProxyResolverMac BUG=95881 Review URL: http://codereview.chromium.org/7838040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100323 0039d316-1c4b-4281-b951-d872f2087c98 --- net/proxy/proxy_resolver_mac.cc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'net') diff --git a/net/proxy/proxy_resolver_mac.cc b/net/proxy/proxy_resolver_mac.cc index 5566e3f..f9af1b7 100644 --- a/net/proxy/proxy_resolver_mac.cc +++ b/net/proxy/proxy_resolver_mac.cc @@ -25,6 +25,11 @@ net::ProxyServer::Scheme GetProxyServerScheme(CFStringRef proxy_type) { return net::ProxyServer::SCHEME_DIRECT; if (CFEqual(proxy_type, kCFProxyTypeHTTP)) return net::ProxyServer::SCHEME_HTTP; + if (CFEqual(proxy_type, kCFProxyTypeHTTPS)) { + // The "HTTPS" on the Mac side here means "proxy applies to https://" URLs; + // the proxy itself is still expected to be an HTTP proxy. + return net::ProxyServer::SCHEME_HTTP; + } if (CFEqual(proxy_type, kCFProxyTypeSOCKS)) { // We can't tell whether this was v4 or v5. We will assume it is // v5 since that is the only version OS X supports. -- cgit v1.1