diff options
| author | wicknix <39230578+wicknix@users.noreply.github.com> | 2019-04-15 18:58:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-15 18:58:07 -0500 |
| commit | 5a1843c9f9e323627f9c35529e6a8c853d4dbb0d (patch) | |
| tree | 62de3cd7cb8a6f75e568863bb73ca2deb80d87a9 /netwerk/base/nsProtocolProxyService.cpp | |
| parent | 065f6f9e5ebc1ed6cfaadaf7851b6021fa94a013 (diff) | |
| parent | 095ea556855b38138e39e713f482eb440f7da9b2 (diff) | |
| download | UXP-5a1843c9f9e323627f9c35529e6a8c853d4dbb0d.tar UXP-5a1843c9f9e323627f9c35529e6a8c853d4dbb0d.tar.gz UXP-5a1843c9f9e323627f9c35529e6a8c853d4dbb0d.tar.lz UXP-5a1843c9f9e323627f9c35529e6a8c853d4dbb0d.tar.xz UXP-5a1843c9f9e323627f9c35529e6a8c853d4dbb0d.zip | |
Merge pull request #1 from MoonchildProductions/master
keep up with mc
Diffstat (limited to 'netwerk/base/nsProtocolProxyService.cpp')
| -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 26eca0e88..237a2a3bd 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 && |