wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-29 11:57:32 +09:00
Code Issues Projects Releases Packages Wiki Activity

Never let "localhost" get sent to a proxy.

Browse source 
Also make "No proxy for" editable always when usable.
This commit is contained in:
wolfbeast 2019-02-07 12:58:13 +01:00 • committed by Roy Tam
commit dbe5dd5e2a
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
application/basilisk/components/preferences/connection.js
View file

@ -76,7 +76,7 @@ var gConnectionsDialog = {
var autologinProxyPref = document.getElementById("signon.autologin.proxy"); var autologinProxyPref = document.getElementById("signon.autologin.proxy");
autologinProxyPref.disabled = proxyTypePref.value == 0; autologinProxyPref.disabled = proxyTypePref.value == 0;
var noProxiesPref = document.getElementById("network.proxy.no_proxies_on"); var noProxiesPref = document.getElementById("network.proxy.no_proxies_on");
noProxiesPref.disabled = proxyTypePref.value != 1; noProxiesPref.disabled = proxyTypePref.value == 0;
var autoconfigURLPref = document.getElementById("network.proxy.autoconfig_url"); var autoconfigURLPref = document.getElementById("network.proxy.autoconfig_url");
autoconfigURLPref.disabled = proxyTypePref.value != 2; autoconfigURLPref.disabled = proxyTypePref.value != 2;

2
application/palemoon/components/preferences/connection.js
View file

@ -63,7 +63,7 @@ var gConnectionsDialog = {
autologinProxyPref.disabled = proxyTypePref.value == 0; autologinProxyPref.disabled = proxyTypePref.value == 0;
var noProxiesPref = document.getElementById("network.proxy.no_proxies_on"); var noProxiesPref = document.getElementById("network.proxy.no_proxies_on");
noProxiesPref.disabled = proxyTypePref.value != 1; noProxiesPref.disabled = proxyTypePref.value == 0;
var autoconfigURLPref = document.getElementById("network.proxy.autoconfig_url"); var autoconfigURLPref = document.getElementById("network.proxy.autoconfig_url");
autoconfigURLPref.disabled = proxyTypePref.value != 2; autoconfigURLPref.disabled = proxyTypePref.value != 2;

7
netwerk/base/nsProtocolProxyService.cpp
View file

@ -1841,6 +1841,13 @@ nsProtocolProxyService::Resolve_Internal(nsIChannel *channel,
if (mPACMan && mPACMan->IsPACURI(uri)) if (mPACMan && mPACMan->IsPACURI(uri))
return NS_OK; 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; bool mainThreadOnly;
if (mSystemProxySettings && if (mSystemProxySettings &&
mProxyConfig == PROXYCONFIG_SYSTEM && mProxyConfig == PROXYCONFIG_SYSTEM &&