Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-19 15:51:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1231552 - Back out bug 1121800, bug 1207798 and bug 1214200 changesets. r=mcmanus

Browse Source
This commit is contained in:
Daniel Stenberg 2015-12-10 07:21:00 +01:00
parent bf563b30b4
commit 07e9a26610
3 changed files with 24 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/libpref/init/all.js
View File

@ -1827,13 +1827,6 @@ pref("network.proxy.socks_remote_dns", false);
pref("network.proxy.proxy_over_tls", true);
pref("network.proxy.no_proxies_on", "localhost, 127.0.0.1");
pref("network.proxy.failover_timeout", 1800); // 30 minutes
// If this value is 'true' and a PAC or all given proxies are inaccessible or
// failing, Firefox will attempt to connect to the server DIRECTly. Meaning
// without a proxy. If set 'false', Firefox will not try to access without
// proxy.
pref("network.proxy.use_direct_on_fail", true);
pref("network.online", true); //online/offline
pref("network.cookie.cookieBehavior", 0); // 0-Accept, 1-dontAcceptForeign, 2-dontAcceptAny, 3-limitForeign
#ifdef ANDROID

65
netwerk/base/nsProtocolProxyService.cpp
View File

@ -647,12 +647,6 @@ nsProtocolProxyService::PrefsChanged(nsIPrefBranch *prefBranch,
mProxyOverTLS);
}
// when proxies fail, try DIRECT
if (!pref || !strcmp(pref, PROXY_PREF("use_direct_on_fail"))) {
proxy_GetBoolPref(prefBranch, PROXY_PREF("use_direct_on_fail"),
mFailoverToDirect);
}
if (!pref || !strcmp(pref, PROXY_PREF("failover_timeout")))
proxy_GetIntPref(prefBranch, PROXY_PREF("failover_timeout"),
mFailedProxyTimeout);
@ -1434,19 +1428,11 @@ nsProtocolProxyService::GetFailoverForProxy(nsIProxyInfo *aProxy,
nsresult aStatus,
nsIProxyInfo **aResult)
{
if (mFailoverToDirect) {
if (mProxyConfig == PROXYCONFIG_DIRECT) {
return NS_ERROR_NOT_AVAILABLE;
}
} else {
// We only support failover when a PAC file is configured, either
// directly or via system settings
if (mProxyConfig != PROXYCONFIG_PAC &&
mProxyConfig != PROXYCONFIG_WPAD &&
mProxyConfig != PROXYCONFIG_SYSTEM) {
return NS_ERROR_NOT_AVAILABLE;
}
}
// We only support failover when a PAC file is configured, either
// directly or via system settings
if (mProxyConfig != PROXYCONFIG_PAC && mProxyConfig != PROXYCONFIG_WPAD &&
mProxyConfig != PROXYCONFIG_SYSTEM)
return NS_ERROR_NOT_AVAILABLE;
// Verify that |aProxy| is one of our nsProxyInfo objects.
nsCOMPtr<nsProxyInfo> pi = do_QueryInterface(aProxy);
@ -2050,24 +2036,23 @@ nsProtocolProxyService::PruneProxyInfo(const nsProtocolInfo &info,
return;
}
// Now, scan to the next proxy not disabled. If all proxies are disabled,
// return blank list to enforce a DIRECT rule.
// Now, scan to see if all remaining proxies are disabled. If so, then
// we'll just bail and return them all. Otherwise, we'll go and prune the
// disabled ones.
bool allDisabled = true;
nsProxyInfo *iter;
if (!mFailoverToDirect) {
for (iter = head; iter; iter = iter->mNext) {
if (!IsProxyDisabled(iter)) {
allDisabled = false;
break;
}
nsProxyInfo *iter;
for (iter = head; iter; iter = iter->mNext) {
if (!IsProxyDisabled(iter)) {
allDisabled = false;
break;
}
}
if (!mFailoverToDirect && allDisabled) {
if (allDisabled)
LOG(("All proxies are disabled, so trying all again"));
} else {
else {
// remove any disabled proxies.
nsProxyInfo *last = nullptr;
for (iter = head; iter; ) {
@ -2076,18 +2061,22 @@ nsProtocolProxyService::PruneProxyInfo(const nsProtocolInfo &info,
nsProxyInfo *reject = iter;
iter = iter->mNext;
if (last) {
if (last)
last->mNext = iter;
}
else
head = iter;
else
head = iter;
reject->mNext = nullptr;
NS_RELEASE(reject);
continue;
}
allDisabled = false;
// since we are about to use this proxy, make sure it is not on
// the disabled proxy list. we'll add it back to that list if
// we have to (in GetFailoverForProxy).
//
// XXX(darin): It might be better to do this as a final pass.
//
EnableProxy(iter);
last = iter;
@ -2095,12 +2084,6 @@ nsProtocolProxyService::PruneProxyInfo(const nsProtocolInfo &info,
}
}
if (mFailoverToDirect && allDisabled) {
LOG(("All proxies are disabled, try a DIRECT rule!"));
*list = nullptr;
return;
}
// if only DIRECT was specified then return no proxy info, and we're done.
if (head && !head->mNext && head->mType == kProxyType_DIRECT)
NS_RELEASE(head);

3
netwerk/base/nsProtocolProxyService.h
View File

@ -396,9 +396,6 @@ protected:
nsFailedProxyTable mFailedProxies;
int32_t mFailedProxyTimeout;
// 'true' means try DIRECT when the proxies fail
bool mFailoverToDirect;
private:
nsresult AsyncResolveInternal(nsIChannel *channel, uint32_t flags,
nsIProtocolProxyCallback *callback,