diff options
| author | Remi Collet <fedora@famillecollet.com> | 2013-07-02 19:31:53 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2013-07-02 19:31:53 +0200 |
| commit | 48c9fbc4181da5d6b61f056bd19a46a655e63fcd (patch) | |
| tree | 0a9f2e9d9d5e35a4ca27dd7e5938dbb71c886375 /mozilla-817533.patch | |
| parent | febddb3746039770061168f17a7250bdcdc19b79 (diff) | |
firefox: sync with rawhide
Diffstat (limited to 'mozilla-817533.patch')
| -rw-r--r-- | mozilla-817533.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/mozilla-817533.patch b/mozilla-817533.patch new file mode 100644 index 0000000..11d1bb7 --- /dev/null +++ b/mozilla-817533.patch @@ -0,0 +1,32 @@ +# HG changeset patch +# Parent d09a5a5666baa44c817a4e1e463ef62eae0a1105 +# User Patrick McManus <mcmanus@ducksong.com> +bug 817533 - failed system proxy lookups should not fallback to manual configs r?jduell + +diff --git a/netwerk/base/src/nsProtocolProxyService.cpp b/netwerk/base/src/nsProtocolProxyService.cpp +--- a/netwerk/base/src/nsProtocolProxyService.cpp ++++ b/netwerk/base/src/nsProtocolProxyService.cpp +@@ -1553,17 +1553,22 @@ nsProtocolProxyService::Resolve_Internal + + // Proxy auto config magic... + if (mProxyConfig == PROXYCONFIG_PAC || mProxyConfig == PROXYCONFIG_WPAD) { + // Do not query PAC now. + *usePACThread = true; + return NS_OK; + } + +- // proxy info values ++ // If we aren't in manual proxy configuration mode then we don't ++ // want to honor any manual specific prefs that might be still set ++ if (mProxyConfig != PROXYCONFIG_MANUAL) ++ return NS_OK; ++ ++ // proxy info values for manual configuration mode + const char *type = nullptr; + const nsACString *host = nullptr; + int32_t port = -1; + + uint32_t proxyFlags = 0; + + if ((flags & RESOLVE_PREFER_SOCKS_PROXY) && + !mSOCKSProxyHost.IsEmpty() && mSOCKSProxyPort > 0) { |