| Index: net/proxy/proxy_resolver_mac.cc
|
| ===================================================================
|
| --- net/proxy/proxy_resolver_mac.cc (revision 31560)
|
| +++ net/proxy/proxy_resolver_mac.cc (working copy)
|
| @@ -165,7 +165,7 @@
|
| config->pac_url = GURL(base::SysCFStringRefToUTF8(pac_url_ref));
|
| }
|
|
|
| - // proxies (for now only ftp, http and https)
|
| + // proxies (for now ftp, http, https, and SOCKS)
|
|
|
| if (GetBoolFromDictionary(config_dict.get(),
|
| kSCPropNetProxiesFTPEnable,
|
| @@ -206,6 +206,19 @@
|
| config->proxy_rules.proxy_for_https = proxy_server;
|
| }
|
| }
|
| + if (GetBoolFromDictionary(config_dict.get(),
|
| + kSCPropNetProxiesSOCKSEnable,
|
| + false)) {
|
| + ProxyServer proxy_server =
|
| + GetProxyServerFromDictionary(ProxyServer::SCHEME_SOCKS5,
|
| + config_dict.get(),
|
| + kSCPropNetProxiesSOCKSProxy,
|
| + kSCPropNetProxiesSOCKSPort);
|
| + if (proxy_server.is_valid()) {
|
| + config->proxy_rules.type = ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME;
|
| + config->proxy_rules.socks_proxy = proxy_server;
|
| + }
|
| + }
|
|
|
| // proxy bypass list
|
|
|
|
|