Backed out 4 changesets (bug 1503393) for failing various browser-chrome tests, e.g. browser_extension_controlled.js. CLOSED TREE
authorSebastian Hengst <archaeopteryx@coole-files.de>
Mon, 03 Dec 2018 17:28:06 +0200
changeset 508458 7670b6ce33a4b3ad15ff3dc1ec3bfb9349cec19b
parent 508457 52e8ef71af9b837be53b294d09381d70c5efceba
child 508459 d1fc8c77ad7fc8098a798cb0df05587d7f374b95
push id1905
push userffxbld-merge
push dateMon, 21 Jan 2019 12:33:13 +0000
treeherdermozilla-release@c2fca1944d8c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1503393
milestone65.0a1
backs out52e8ef71af9b837be53b294d09381d70c5efceba
7878029aaba609b5433d3eea98873a450cf2cb62
02e383b73c971e656097b3040e9cc523039018d6
49428012434e379316f2d831a088a27cf1b429ee
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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)
browser/components/originattributes/test/browser/browser_firstPartyIsolation.js
browser/components/preferences/connection.js
netwerk/base/nsProtocolProxyService.cpp
netwerk/test/unit/test_protocolproxyservice.js
netwerk/test/unit/test_proxy-failover_canceled.js
--- a/browser/components/originattributes/test/browser/browser_firstPartyIsolation.js
+++ b/browser/components/originattributes/test/browser/browser_firstPartyIsolation.js
@@ -282,21 +282,16 @@ add_task(async function window_open_form
 
 /**
  * A test for using an IP address as the first party domain.
  */
 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);
 
   await ContentTask.spawn(tab.linkedBrowser, { firstPartyDomain: ipAddr }, async function(attrs) {
     info("document principal: " + content.document.nodePrincipal.origin);
     Assert.equal(content.document.nodePrincipal.originAttributes.firstPartyDomain,
                    attrs.firstPartyDomain, "The firstPartyDomain should be set properly for the IP address");
   });
--- a/browser/components/preferences/connection.js
+++ b/browser/components/preferences/connection.js
@@ -123,17 +123,17 @@ var gConnectionsDialog = {
     // Now update the other protocols
     this.updateProtocolPrefs();
 
     var shareProxiesPref = Preferences.get("network.proxy.share_proxy_settings");
     shareProxiesPref.disabled = proxyTypePref.value != 1;
     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;
 
     this.updateReloadButton();
   },
 
   updateDNSPref() {
--- a/netwerk/base/nsProtocolProxyService.cpp
+++ b/netwerk/base/nsProtocolProxyService.cpp
@@ -2027,22 +2027,16 @@ nsresult nsProtocolProxyService::Resolve
   nsresult rv = GetProxyURI(channel, getter_AddRefs(uri));
   if (NS_FAILED(rv)) return rv;
 
   // See bug #586908.
   // Avoid endless loop if |uri| is the current PAC-URI. Returning OK
   // 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)) &&
       !mainThreadOnly) {
     *usePACThread = true;
     return NS_OK;
   }
 
--- a/netwerk/test/unit/test_protocolproxyservice.js
+++ b/netwerk/test/unit/test_protocolproxyservice.js
@@ -948,50 +948,19 @@ function run_isresolvable_test()
 
 function isresolvable_callback(pi)
 {
   Assert.notEqual(pi, null);
   Assert.equal(pi.type, "http");
   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();
 
   // start of asynchronous test chain
   run_filter_test();
   do_test_pending();
 }
--- a/netwerk/test/unit/test_proxy-failover_canceled.js
+++ b/netwerk/test/unit/test_proxy-failover_canceled.js
@@ -34,18 +34,17 @@ function run_test()
   // redirects from now.
 
   var nc = new ChannelEventSink();
   nc._flags = ES_ABORT_REDIRECT;
 
   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 + "';}"
   );
 
   var chan = make_channel("http://localhost:" +
                           httpServer.identity.primaryPort + "/content");
   chan.notificationCallbacks = nc;