зеркало из https://github.com/mozilla/gecko-dev.git
Backed out 4 changesets (bug 1503393) for failing various browser-chrome tests, e.g. browser_extension_controlled.js. CLOSED TREE
Backed out changeset 52e8ef71af9b (bug 1503393) Backed out changeset 7878029aaba6 (bug 1503393) Backed out changeset 02e383b73c97 (bug 1503393) Backed out changeset 49428012434e (bug 1503393)
This commit is contained in:
Родитель
1733ff10c8
Коммит
ade92e3f6b
|
@ -287,11 +287,6 @@ add_task(async function ip_address_test() {
|
|||
const ipAddr = "127.0.0.1";
|
||||
const ipHost = `http://${ipAddr}/browser/browser/components/originattributes/test/browser/`;
|
||||
|
||||
Services.prefs.setCharPref("network.proxy.no_proxies_on", "");
|
||||
registerCleanupFunction(function() {
|
||||
Services.prefs.clearUserPref("network.proxy.no_proxies_on");
|
||||
});
|
||||
|
||||
let tab = BrowserTestUtils.addTab(gBrowser, ipHost + "test_firstParty.html");
|
||||
await BrowserTestUtils.browserLoaded(tab.linkedBrowser, true);
|
||||
|
||||
|
|
|
@ -128,7 +128,7 @@ var gConnectionsDialog = {
|
|||
var autologinProxyPref = Preferences.get("signon.autologin.proxy");
|
||||
autologinProxyPref.disabled = proxyTypePref.value == 0;
|
||||
var noProxiesPref = Preferences.get("network.proxy.no_proxies_on");
|
||||
noProxiesPref.disabled = proxyTypePref.value == 0;
|
||||
noProxiesPref.disabled = proxyTypePref.value != 1;
|
||||
|
||||
var autoconfigURLPref = Preferences.get("network.proxy.autoconfig_url");
|
||||
autoconfigURLPref.disabled = proxyTypePref.value != 2;
|
||||
|
|
|
@ -2032,12 +2032,6 @@ nsresult nsProtocolProxyService::Resolve_Internal(nsIChannel *channel,
|
|||
// here means that we will not use a proxy for this connection.
|
||||
if (mPACMan && mPACMan->IsPACURI(uri)) 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;
|
||||
if (mSystemProxySettings && mProxyConfig == PROXYCONFIG_SYSTEM &&
|
||||
NS_SUCCEEDED(mSystemProxySettings->GetMainThreadOnly(&mainThreadOnly)) &&
|
||||
|
|
|
@ -953,41 +953,10 @@ function isresolvable_callback(pi)
|
|||
Assert.equal(pi.port, 1234);
|
||||
Assert.equal(pi.host, "127.0.0.1");
|
||||
|
||||
run_localhost_pac();
|
||||
}
|
||||
|
||||
function run_localhost_pac()
|
||||
{
|
||||
// test localhost in the pac file
|
||||
|
||||
var pac = 'data:text/plain,' +
|
||||
'function FindProxyForURL(url, host) {' +
|
||||
' return "PROXY totallycrazy:1234";' +
|
||||
'}';
|
||||
|
||||
// Use default filter list string for "no_proxies_on" ("localhost, 127.0.0.1")
|
||||
prefs.clearUserPref("network.proxy.no_proxies_on");
|
||||
var channel = NetUtil.newChannel({
|
||||
uri: "http://localhost/",
|
||||
loadUsingSystemPrincipal: true
|
||||
});
|
||||
prefs.setIntPref("network.proxy.type", 2);
|
||||
prefs.setCharPref("network.proxy.autoconfig_url", pac);
|
||||
|
||||
var cb = new resolveCallback();
|
||||
cb.nextFunction = localhost_callback;
|
||||
var req = pps.asyncResolve(channel, 0, cb);
|
||||
}
|
||||
|
||||
function localhost_callback(pi)
|
||||
{
|
||||
Assert.equal(pi, null); // no proxy!
|
||||
|
||||
prefs.setIntPref("network.proxy.type", 0);
|
||||
do_test_finished();
|
||||
}
|
||||
|
||||
|
||||
function run_test() {
|
||||
register_test_protocol_handler();
|
||||
|
||||
|
|
|
@ -39,8 +39,7 @@ function run_test()
|
|||
var prefserv = Cc["@mozilla.org/preferences-service;1"].
|
||||
getService(Ci.nsIPrefService);
|
||||
var prefs = prefserv.getBranch("network.proxy.");
|
||||
prefs.setIntPref("type", 2);
|
||||
prefs.setCharPref("no_proxies_on", "nothing");
|
||||
prefs.setIntPref("type", 2);
|
||||
prefs.setCharPref("autoconfig_url", "data:text/plain," +
|
||||
"function FindProxyForURL(url, host) {return 'PROXY a_non_existent_domain_x7x6c572v:80; PROXY localhost:" +
|
||||
httpServer.identity.primaryPort + "';}"
|
||||
|
|
Загрузка…
Ссылка в новой задаче