Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(410)

Unified Diff: net/proxy/proxy_config_service_android.cc

Issue 812543002: Update from https://crrev.com/308331 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/net.gypi ('k') | net/proxy/proxy_resolver_script.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_config_service_android.cc
diff --git a/net/proxy/proxy_config_service_android.cc b/net/proxy/proxy_config_service_android.cc
index 50407fe21b7b44dd923730b2f948ab1e0b84efc8..80e3b929b454261cb0b6ab10e2e6b900f29be83f 100644
--- a/net/proxy/proxy_config_service_android.cc
+++ b/net/proxy/proxy_config_service_android.cc
@@ -98,6 +98,12 @@ void AddBypassRules(const std::string& scheme,
// by | and that use * as a wildcard. For example, setting the
// 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())
« no previous file with comments | « net/net.gypi ('k') | net/proxy/proxy_resolver_script.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698