diff options
author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2013-09-18 15:25:19 -0300 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2013-09-18 15:25:19 -0300 |
commit | d149ac437ba3609517f0afe43336110f0ee7fa1a (patch) | |
tree | 03d76457304542e93b20d415113a53f35ef3afe1 /libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch | |
parent | ffa02e401d290931439fd16ae2e388af718494e8 (diff) |
iceweasel-libre-1:24.0.deb1-1: updating version
* fix i686 build
* remove unnecessaries deps; add inetutils (hostname is called during build, and recorded); add gold linker, but keep commented for now
* remove loading icon patch; should not be needed since libpng 1.6.3
* try to build without shared-libs.patch; hopefully not needed anymore
Diffstat (limited to 'libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch')
-rw-r--r-- | libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch b/libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch deleted file mode 100644 index 56e4bfc45..000000000 --- a/libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch +++ /dev/null @@ -1,36 +0,0 @@ - -# HG changeset patch -# User Patrick McManus <mcmanus@ducksong.com> -# Date 1365623297 14400 -# Node ID 85f1d207f52546e0e5fe78990cdefe6efae485fb -# Parent 2bb26d742f5ffd2d946291fd3c688dc3d6d34f67 -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) { - |