diff options
| author | sgurun <sgurun@chromium.org> | 2015-10-13 15:18:14 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-13 22:19:12 +0000 |
| commit | dc07f45653c5ff2a3478bc396ac5e35a99d103c6 (patch) | |
| tree | 5832a986d6663ac95ba8d91d042c7e1598f074ff | |
| parent | feff5b3ca8a84606840ddb2b7f0d87127897c1c8 (diff) | |
| download | chromium_src-dc07f45653c5ff2a3478bc396ac5e35a99d103c6.zip chromium_src-dc07f45653c5ff2a3478bc396ac5e35a99d103c6.tar.gz chromium_src-dc07f45653c5ff2a3478bc396ac5e35a99d103c6.tar.bz2 | |
Do not exclude localhost automatically
BUG=471400
Android allows excluding localhost via wi-fi proxy setting and device policy manager. Do not exclude the localhost by default.
Review URL: https://codereview.chromium.org/1298223007
Cr-Commit-Position: refs/heads/master@{#353872}
| -rw-r--r-- | net/proxy/proxy_config_service_android.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/proxy/proxy_config_service_android.cc b/net/proxy/proxy_config_service_android.cc index 66065fb..44c4522 100644 --- a/net/proxy/proxy_config_service_android.cc +++ b/net/proxy/proxy_config_service_android.cc @@ -99,11 +99,6 @@ void AddBypassRules(const std::string& scheme, // http.nonProxyHosts property to *.android.com|*.kernel.org will cause // requests to http://developer.android.com to be made without a proxy. - // Force localhost to be on the proxy exclusion list; - // otherwise all localhost traffic is routed through - // the proxy which is not desired. - bypass_rules->AddRuleToBypassLocal(); - std::string non_proxy_hosts = get_property.Run(scheme + ".nonProxyHosts"); if (non_proxy_hosts.empty()) |