wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1207798 - add pref to toggle proxy behavior when inaccessible. r=mcmanus

Browse Source
This commit is contained in:
Daniel Stenberg 2015-11-10 15:27:45 +01:00
parent 30d374a51d
commit 4ded8a4e2a
3 changed files with 61 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1822,6 +1822,13 @@ 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-dontUse, 3-limitForeign
#ifdef ANDROID

72
netwerk/base/nsProtocolProxyService.cpp
View File

@ -647,6 +647,12 @@ 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);
@ -1405,8 +1411,18 @@ nsProtocolProxyService::GetFailoverForProxy(nsIProxyInfo *aProxy,
nsresult aStatus,
nsIProxyInfo **aResult)
{
if (mProxyConfig == PROXYCONFIG_DIRECT) {
return NS_ERROR_NOT_AVAILABLE;
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;
}
}
// Verify that |aProxy| is one of our nsProxyInfo objects.
@ -2009,32 +2025,46 @@ nsProtocolProxyService::PruneProxyInfo(const nsProtocolInfo &info,
bool allDisabled = true;
nsProxyInfo *iter;
// remove any disabled proxies.
nsProxyInfo *last = nullptr;
for (iter = head; iter; ) {
if (IsProxyDisabled(iter)) {
// reject!
nsProxyInfo *reject = iter;
if (!mFailoverToDirect) {
for (iter = head; iter; iter = iter->mNext) {
if (!IsProxyDisabled(iter)) {
allDisabled = false;
break;
}
}
}
iter = iter->mNext;
if (last)
last->mNext = iter;
if (!mFailoverToDirect && allDisabled) {
LOG(("All proxies are disabled, so trying all again"));
} else {
// remove any disabled proxies.
nsProxyInfo *last = nullptr;
for (iter = head; iter; ) {
if (IsProxyDisabled(iter)) {
// reject!
nsProxyInfo *reject = iter;
iter = iter->mNext;
if (last) {
last->mNext = iter;
}
else
head = iter;
reject->mNext = nullptr;
NS_RELEASE(reject);
continue;
reject->mNext = nullptr;
NS_RELEASE(reject);
continue;
}
allDisabled = false;
EnableProxy(iter);
last = iter;
iter = iter->mNext;
}
allDisabled = false;
EnableProxy(iter);
last = iter;
iter = iter->mNext;
}
if (allDisabled) {
if (mFailoverToDirect && allDisabled) {
LOG(("All proxies are disabled, try a DIRECT rule!"));
*list = nullptr;
return;

3
netwerk/base/nsProtocolProxyService.h
View File

@ -390,6 +390,9 @@ 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,