diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-07 12:58:13 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-07 12:58:13 +0100 |
| commit | 32e29d18a56df2b4a681da1aa1615f30f9756949 (patch) | |
| tree | 667a6cf15697f4b6343dc082eae591433db994ed /netwerk | |
| parent | 79b32527670570dffca92cc9f3bb957661da0a78 (diff) | |
| download | uxp-32e29d18a56df2b4a681da1aa1615f30f9756949.tar.gz | |
Never let "localhost" get sent to a proxy.
Also make "No proxy for" editable always when usable.
Diffstat (limited to 'netwerk')
| -rw-r--r-- | netwerk/base/nsProtocolProxyService.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/netwerk/base/nsProtocolProxyService.cpp b/netwerk/base/nsProtocolProxyService.cpp index 26eca0e884..237a2a3bd3 100644 --- a/netwerk/base/nsProtocolProxyService.cpp +++ b/netwerk/base/nsProtocolProxyService.cpp @@ -1841,6 +1841,13 @@ nsProtocolProxyService::Resolve_Internal(nsIChannel *channel, if (mPACMan && mPACMan->IsPACURI(uri)) return NS_OK; + // If proxies are enabled and this host:port combo is supposed to use a
+ // proxy, check for a proxy.
+ if ((mProxyConfig == PROXYCONFIG_DIRECT) ||
+ !CanUseProxy(uri, info.defaultPort)) {
+ return NS_OK;
+ }
+ bool mainThreadOnly; if (mSystemProxySettings && mProxyConfig == PROXYCONFIG_SYSTEM && |