Merging upstream version 126.0.

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

5 files changed, 52 insertions, 39 deletions

diff --git a/testing/web-platform/meta/fetch/api/basic/request-upload.h2.any.js.ini b/testing/web-platform/meta/fetch/api/basic/request-upload.h2.any.js.ini
index efaa4370b1..fb235e791c 100644
--- a/testing/web-platform/meta/fetch/api/basic/request-upload.h2.any.js.ini
+++ b/testing/web-platform/meta/fetch/api/basic/request-upload.h2.any.js.ini
@@ -109,37 +109,60 @@
 [request-upload.h2.any.html]
   expected:
     if (os == "mac") and not debug: [ERROR, OK]
-    if os == "android": TIMEOUT
+    if os == "android": [ERROR, TIMEOUT]
     ERROR
+
   [Fetch with POST with empty ReadableStream]
-    expected: FAIL
+    expected:
+      if os == "android": [PASS, FAIL]
+      PASS
 
   [Fetch with POST with ReadableStream]
-    expected: FAIL
+    expected:
+      if os == "android": [PASS, FAIL]
+      PASS
 
   [Fetch with POST with ReadableStream on 421 response should return the response and not retry.]
-    expected: FAIL
-
+    expected:
+      if os == "android": [PASS, FAIL]
+      PASS
+ 
   [Feature detect for POST with ReadableStream]
-    expected: FAIL
+    expected:
+      if os == "android": [PASS, FAIL]
+      PASS
 
   [Feature detect for POST with ReadableStream, using request object]
-    expected: FAIL
+    expected:
+      if os == "android": [PASS, FAIL]
+      PASS
+
+  [Synchronous feature detect]
+    expected:
+      if os == "android": [PASS, FAIL]
+      PASS
 
   [Streaming upload with body containing a String]
-    expected: FAIL
+    expected:
+      if os == "android": [PASS, FAIL]
+      PASS
 
   [Streaming upload with body containing null]
-    expected: FAIL
+    expected:
+      if os == "android": [PASS, FAIL]
+      PASS
 
   [Streaming upload with body containing a number]
-    expected: FAIL
+    expected:
+      if os == "android": [PASS, FAIL]
+      PASS
 
   [Streaming upload should fail on a 401 response]
-    expected: FAIL
-
-  [Synchronous feature detect]
-    expected: FAIL
+    expected:
+      if os == "android": [PASS, FAIL]
+      PASS
 
   [ReadbleStream should be closed on signal.abort]
-    expected: TIMEOUT
+     expected:
+      if os == "android": [PASS, TIMEOUT]
+      PASS
diff --git a/testing/web-platform/meta/fetch/api/redirect/redirect-keepalive.https.any.js.ini b/testing/web-platform/meta/fetch/api/redirect/redirect-keepalive.https.any.js.ini
index a437c2dbd7..60a2d2f498 100644
--- a/testing/web-platform/meta/fetch/api/redirect/redirect-keepalive.https.any.js.ini
+++ b/testing/web-platform/meta/fetch/api/redirect/redirect-keepalive.https.any.js.ini
@@ -1,16 +1,12 @@
 [redirect-keepalive.https.any.html]
   expected:
-    if (os == "linux") and fission and not debug and not asan and tsan: [TIMEOUT, OK]
-    if (os == "linux") and fission and not debug and not asan and not tsan: [OK, TIMEOUT]
-    if (os == "linux") and fission and not debug and asan: [TIMEOUT, OK]
-    if (os == "win") and (processor == "x86_64") and swgl: TIMEOUT
-    if (os == "win") and (processor == "x86_64") and not swgl: [OK, TIMEOUT]
-    if (os == "linux") and fission and debug: [OK, TIMEOUT]
+    if fission and (os == "win") and (processor == "x86") and not debug: OK
+    if fission and (os == "mac") and debug: OK
+    if not fission: OK
+    [OK, TIMEOUT]
   [[keepalive\][iframe\][load\] mixed content redirect; setting up]
     expected:
-      if (os == "linux") and fission and not debug and not asan and tsan: [TIMEOUT, PASS]
-      if (os == "linux") and fission and not debug and not asan and not tsan: [PASS, TIMEOUT]
-      if (os == "linux") and fission and not debug and asan: [TIMEOUT, PASS]
-      if (os == "win") and (processor == "x86_64") and swgl: TIMEOUT
-      if (os == "win") and (processor == "x86_64") and not swgl: [PASS, TIMEOUT]
-      if (os == "linux") and fission and debug: [PASS, TIMEOUT]
+      if fission and (os == "win") and (processor == "x86") and not debug: PASS
+      if fission and (os == "mac") and debug: PASS
+      if not fission: PASS
+      [PASS, TIMEOUT]
diff --git a/testing/web-platform/meta/fetch/api/request/destination/fetch-destination.https.html.ini b/testing/web-platform/meta/fetch/api/request/destination/fetch-destination.https.html.ini
index 6cf66cc8df..ecd61dfa67 100644
--- a/testing/web-platform/meta/fetch/api/request/destination/fetch-destination.https.html.ini
+++ b/testing/web-platform/meta/fetch/api/request/destination/fetch-destination.https.html.ini
@@ -1,4 +1,6 @@
 [fetch-destination.https.html]
+  expected:
+    if (os == "android") and not debug: [OK, ERROR]
   [HTMLLinkElement with rel=preload and as=audio fetches with a "audio" Request.destination]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/fetch/api/request/request-bad-port.any.js.ini b/testing/web-platform/meta/fetch/api/request/request-bad-port.any.js.ini
index 496558e324..e30013b1c1 100644
--- a/testing/web-platform/meta/fetch/api/request/request-bad-port.any.js.ini
+++ b/testing/web-platform/meta/fetch/api/request/request-bad-port.any.js.ini
@@ -1,11 +1,14 @@
 [request-bad-port.any.html]
   expected:
     if (os == "android") and fission: [OK, TIMEOUT]
+    CRASH
 
 [request-bad-port.any.serviceworker.html]
   expected:
     if (os == "android") and fission: [OK, TIMEOUT]
 
 [request-bad-port.any.worker.html]
+  expected: CRASH
 
 [request-bad-port.any.sharedworker.html]
+  expected: CRASH
diff --git a/testing/web-platform/meta/fetch/api/request/request-keepalive.any.js.ini b/testing/web-platform/meta/fetch/api/request/request-keepalive.any.js.ini
index a381948828..9298bef1ad 100644
--- a/testing/web-platform/meta/fetch/api/request/request-keepalive.any.js.ini
+++ b/testing/web-platform/meta/fetch/api/request/request-keepalive.any.js.ini
@@ -1,12 +1,10 @@
+prefs: [dom.fetchKeepalive.enabled:true]
 [request-keepalive.any.sharedworker.html]
   expected:
     if (os == "android") and fission: [OK, TIMEOUT]
   [keepalive flag with stream body]
     expected: FAIL
 
-  [keepalive flag]
-    expected: FAIL
-
 
 [request-keepalive.any.worker.html]
   expected:
@@ -14,21 +12,12 @@
   [keepalive flag with stream body]
     expected: FAIL
 
-  [keepalive flag]
-    expected: FAIL
-
 
 [request-keepalive.any.serviceworker.html]
   [keepalive flag with stream body]
     expected: FAIL
 
-  [keepalive flag]
-    expected: FAIL
-
 
 [request-keepalive.any.html]
   [keepalive flag with stream body]
     expected: FAIL
-
-  [keepalive flag]
-    expected: FAIL