Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 23 insertions, 3 deletions

diff --git a/netwerk/test/browser/browser.toml b/netwerk/test/browser/browser.toml
index 9a470d8c59..002bd2769d 100644
--- a/netwerk/test/browser/browser.toml
+++ b/netwerk/test/browser/browser.toml
@@ -74,6 +74,10 @@ support-files = [
   "file_link_header.sjs",
 ]
 
+prefs = [
+  "network.fetch.systemDefaultsToOmittingCredentials=false"
+]
+
 ["browser_103_assets.js"]
 
 ["browser_103_assets_extension.js"]
diff --git a/netwerk/test/browser/browser_bug1629307.js b/netwerk/test/browser/browser_bug1629307.js
index 03ea2476e2..1cab7bc101 100644
--- a/netwerk/test/browser/browser_bug1629307.js
+++ b/netwerk/test/browser/browser_bug1629307.js
@@ -24,7 +24,7 @@ add_task(async function () {
   PromptTestUtils.handleNextPrompt(
     window,
     {
-      modalType: Services.prefs.getIntPref("prompts.modalType.httpAuth"),
+      modalType: Ci.nsIPrompt.MODAL_TYPE_TAB,
       promptType: "promptUserAndPass",
     },
     { buttonNumClick: 1 }
@@ -59,7 +59,7 @@ add_task(async function () {
   PromptTestUtils.handleNextPrompt(
     window,
     {
-      modalType: Services.prefs.getIntPref("prompts.modalType.httpAuth"),
+      modalType: Ci.nsIPrompt.MODAL_TYPE_TAB,
       promptType: "promptUserAndPass",
     },
     { buttonNumClick: 1 }
diff --git a/netwerk/test/browser/browser_cookie_filtering_insecure.js b/netwerk/test/browser/browser_cookie_filtering_insecure.js
index 679bfc5a56..4f46773675 100644
--- a/netwerk/test/browser/browser_cookie_filtering_insecure.js
+++ b/netwerk/test/browser/browser_cookie_filtering_insecure.js
@@ -4,6 +4,14 @@
  */
 "use strict";
 
+// performing http and https testing within this file,
+// and we do not want https-first to interfere with that test
+Services.prefs.setBoolPref("dom.security.https_first", false);
+
+registerCleanupFunction(function () {
+  Services.prefs.clearUserPref("dom.security.https_first");
+});
+
 const {
   HTTPS_EXAMPLE_ORG,
   HTTPS_EXAMPLE_COM,
diff --git a/netwerk/test/browser/browser_cookie_filtering_subdomain.js b/netwerk/test/browser/browser_cookie_filtering_subdomain.js
index 78fcdb07dd..4a27eea1e8 100644
--- a/netwerk/test/browser/browser_cookie_filtering_subdomain.js
+++ b/netwerk/test/browser/browser_cookie_filtering_subdomain.js
@@ -5,6 +5,14 @@
 
 "use strict";
 
+// performing http and https testing within this file,
+// and we do not want https-first to interfere with that test
+Services.prefs.setBoolPref("dom.security.https_first", false);
+
+registerCleanupFunction(function () {
+  Services.prefs.clearUserPref("dom.security.https_first");
+});
+
 const {
   HTTPS_EXAMPLE_ORG,
   HTTPS_EXAMPLE_COM,
diff --git a/netwerk/test/browser/browser_post_auth.js b/netwerk/test/browser/browser_post_auth.js
index 24104f96d6..1168cdabb1 100644
--- a/netwerk/test/browser/browser_post_auth.js
+++ b/netwerk/test/browser/browser_post_auth.js
@@ -43,7 +43,7 @@ add_task(async function () {
   let promptPromise = PromptTestUtils.handleNextPrompt(
     tab.linkedBrowser,
     {
-      modalType: Services.prefs.getIntPref("prompts.modalType.httpAuth"),
+      modalType: Ci.nsIPrompt.MODAL_TYPE_TAB,
       promptType: "promptUserAndPass",
     },
     { buttonNumClick: 0, loginInput: "user", passwordInput: "pass" }