Merging upstream version 115.10.0esr.

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

2 files changed, 16 insertions, 35 deletions

diff --git a/testing/web-platform/meta/secure-payment-confirmation/enrollment.https.html.ini b/testing/web-platform/meta/secure-payment-confirmation/enrollment.https.html.ini
index 2b32432b2e..09408aa1bc 100644
--- a/testing/web-platform/meta/secure-payment-confirmation/enrollment.https.html.ini
+++ b/testing/web-platform/meta/secure-payment-confirmation/enrollment.https.html.ini
@@ -3,51 +3,22 @@
     if os == "android": OK
     TIMEOUT
   [Payment credential is created successfully.]
-    expected:
-      if (os == "linux") and not debug and (processor == "x86_64") and fission: [FAIL, TIMEOUT]
-      if (os == "linux") and not debug and (processor == "x86_64") and not fission: [FAIL, TIMEOUT]
-      if (os == "linux") and not debug and (processor == "x86"): [TIMEOUT, FAIL]
-      if (os == "linux") and debug: [FAIL, TIMEOUT]
-      if (os == "mac") and debug: [FAIL, TIMEOUT]
-      if (os == "mac") and not debug: [TIMEOUT, FAIL]
-      FAIL
+    expected: [TIMEOUT, FAIL]
 
   [Payment credential requires userVerification to be "required", not "preferred".]
-    expected:
-      if (os == "linux") and ccov: [TIMEOUT, NOTRUN, FAIL]
-      if (os == "linux") and not debug and (processor == "x86_64") and fission: [TIMEOUT, NOTRUN, FAIL]
-      if (os == "linux") and not debug and (processor == "x86_64") and not fission: [TIMEOUT, NOTRUN, FAIL]
-      if (os == "linux") and not debug and (processor == "x86"): [NOTRUN, FAIL, TIMEOUT]
-      if (os == "mac") and not debug: [NOTRUN, FAIL, TIMEOUT]
-      if (os == "mac") and debug: [TIMEOUT, FAIL, NOTRUN]
-      if (os == "linux") and debug: [TIMEOUT, FAIL, NOTRUN]
-      FAIL
+    expected: [FAIL, NOTRUN, TIMEOUT]
 
   [Payment credential requires userVerification to be "required", not "discouraged".]
-    expected:
-      if os == "mac": [NOTRUN, FAIL, TIMEOUT]
-      if os == "linux": [NOTRUN, TIMEOUT]
-      FAIL
+    expected: [FAIL, NOTRUN, TIMEOUT]
 
   [Payment credential requires authenticatorAttachment to be "platform", not "cross-platform".]
-    expected:
-      if os == "android": FAIL
-      if os == "win": TIMEOUT
-      NOTRUN
+    expected: [FAIL, NOTRUN, TIMEOUT]
 
   [Payment credential allows residentKey to be "preferred".]
-    expected:
-      if (os == "linux") and not debug and fission and (processor == "x86"): [NOTRUN, FAIL, TIMEOUT]
-      if (os == "linux") and not debug and fission and (processor == "x86_64"): [FAIL, NOTRUN, TIMEOUT]
-      if (os == "linux") and not debug and not fission: [FAIL, NOTRUN, TIMEOUT]
-      if (os == "mac") and not debug: [NOTRUN, TIMEOUT]
-      FAIL
+    expected: [FAIL, NOTRUN, TIMEOUT]
 
   [Payment credential does not allow residentKey to be "discouraged".]
-    expected:
-      if os == "win": FAIL
-      if os == "android": FAIL
-      NOTRUN
+    expected: [FAIL, NOTRUN]
 
   [Payment credential abort without reason]
     expected:
diff --git a/testing/xpcshell/moz-http2/moz-http2.js b/testing/xpcshell/moz-http2/moz-http2.js
index 334ccd8e1c..1b602e88bb 100644
--- a/testing/xpcshell/moz-http2/moz-http2.js
+++ b/testing/xpcshell/moz-http2/moz-http2.js
@@ -824,6 +824,16 @@ function handleRequest(req, res) {
     });
     push.writeHead(200, pushResponseHeaders);
     push.end("ok");
+  } else if (u.pathname === "/hugecontinuedheaders") {
+    for (let i = 0; i < u.query.size; i++) {
+      res.setHeader(
+        "X-Test-Header-" + i,
+        "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789".repeat(1024)
+      );
+    }
+    res.writeHead(200);
+    res.end(content);
+    return;
   } else if (u.pathname === "/altsvc1") {
     if (
       req.httpVersionMajor != 2 ||