Merging upstream version 126.0.

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

6 files changed, 23 insertions, 8 deletions

diff --git a/testing/web-platform/meta/fetch/security/dangling-markup/dangling-markup-mitigation-allowed-apis.tentative.https.html.ini b/testing/web-platform/meta/fetch/security/dangling-markup/dangling-markup-mitigation-allowed-apis.tentative.https.html.ini
new file mode 100644
index 0000000000..2203040c5a
--- /dev/null
+++ b/testing/web-platform/meta/fetch/security/dangling-markup/dangling-markup-mitigation-allowed-apis.tentative.https.html.ini
@@ -0,0 +1,15 @@
+[dangling-markup-mitigation-allowed-apis.tentative.https.html]
+  [Does not block xhr]
+    expected: FAIL
+
+  [Does not block EventSource]
+    expected: FAIL
+
+  [Does not block fetch]
+    expected: FAIL
+
+  [Does not block Worker]
+    expected: FAIL
+
+  [Does not block importScripts]
+    expected: FAIL
diff --git a/testing/web-platform/meta/fetch/security/dangling-markup/dangling-markup-mitigation-data-url.sub.html.ini b/testing/web-platform/meta/fetch/security/dangling-markup/dangling-markup-mitigation-data-url.tentative.sub.html.ini
index 3ad84da9ea..7f912d09db 100644
--- a/testing/web-platform/meta/fetch/security/dangling-markup/dangling-markup-mitigation-data-url.sub.html.ini
+++ b/testing/web-platform/meta/fetch/security/dangling-markup/dangling-markup-mitigation-data-url.tentative.sub.html.ini
@@ -1,4 +1,4 @@
-[dangling-markup-mitigation-data-url.sub.html]
+[dangling-markup-mitigation-data-url.tentative.sub.html]
   [<iframe id="dangling"\\n        src="data:text/html,\\n            <img\\n              onload='window.parent.postMessage(&quot;loaded&quot;, &quot;*&quot;);'\\n              onerror='window.parent.postMessage(&quot;error&quot;, &quot;*&quot;);'\\n              src='http://web-platform.test:8000/images/gr&#10;een-256x256.png?&lt;'>\\n        ">\\n     </iframe>]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/fetch/security/dangling-markup/dangling-markup-mitigation.https.html.ini b/testing/web-platform/meta/fetch/security/dangling-markup/dangling-markup-mitigation.https.html.ini
deleted file mode 100644
index cb771fa501..0000000000
--- a/testing/web-platform/meta/fetch/security/dangling-markup/dangling-markup-mitigation.https.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[dangling-markup-mitigation.https.html]
-  expected:
-    if (os == "win") and not debug and (processor == "x86_64"): [ERROR, TIMEOUT]
-    ERROR
-  [Only blocks dangling markup requests]
-    expected: TIMEOUT
diff --git a/testing/web-platform/meta/fetch/security/dangling-markup/dangling-markup-mitigation.html.ini b/testing/web-platform/meta/fetch/security/dangling-markup/dangling-markup-mitigation.tentative.html.ini
index c7893561e2..3b0a8472ab 100644
--- a/testing/web-platform/meta/fetch/security/dangling-markup/dangling-markup-mitigation.html.ini
+++ b/testing/web-platform/meta/fetch/security/dangling-markup/dangling-markup-mitigation.tentative.html.ini
@@ -1,4 +1,4 @@
-[dangling-markup-mitigation.html]
+[dangling-markup-mitigation.tentative.html]
   [Fetch: /images/gre\\nen-1x1.png?img=<]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/fetch/security/dangling-markup/dangling-markup-mitigation.tentative.https.html.ini b/testing/web-platform/meta/fetch/security/dangling-markup/dangling-markup-mitigation.tentative.https.html.ini
new file mode 100644
index 0000000000..84e1a1eb33
--- /dev/null
+++ b/testing/web-platform/meta/fetch/security/dangling-markup/dangling-markup-mitigation.tentative.https.html.ini
@@ -0,0 +1,4 @@
+[dangling-markup-mitigation.tentative.https.html]
+  expected: ERROR
+  [Only blocks dangling markup requests]
+    expected: TIMEOUT
diff --git a/testing/web-platform/meta/fetch/security/dangling-markup/option.html.ini b/testing/web-platform/meta/fetch/security/dangling-markup/option.html.ini
index 7be7277c4a..24e57c5457 100644
--- a/testing/web-platform/meta/fetch/security/dangling-markup/option.html.ini
+++ b/testing/web-platform/meta/fetch/security/dangling-markup/option.html.ini
@@ -1,4 +1,6 @@
 [option.html]
+  expected:
+    if (os == "android") and not debug: [OK, CRASH]
   [      <form action="/resource-timing/resources/document-navigated.html" method="post">        <input type="submit">        <select name="dangling"><option>    ]
     expected: FAIL