Make DocumentThreadableLoader error logging more consistent
https://bugs.webkit.org/show_bug.cgi?id=184853
Reviewed by Chris Dumez.
LayoutTests/imported/w3c:
* web-platform-tests/XMLHttpRequest/access-control-basic-cors-safelisted-request-headers-expected.txt:
* web-platform-tests/XMLHttpRequest/access-control-basic-denied-expected.txt:
* web-platform-tests/XMLHttpRequest/access-control-basic-get-fail-non-simple-expected.txt:
* web-platform-tests/XMLHttpRequest/access-control-basic-non-cors-safelisted-content-type-expected.txt:
* web-platform-tests/XMLHttpRequest/access-control-basic-post-with-non-cors-safelisted-content-type-expected.txt:
* web-platform-tests/XMLHttpRequest/access-control-basic-preflight-denied-expected.txt:
* web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-301-expected.txt:
* web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-400-expected.txt:
* web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-501-expected.txt:
* web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-denied-expected.txt:
* web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-denied-without-wildcard-expected.txt:
* web-platform-tests/XMLHttpRequest/send-non-same-origin-expected.txt:
* web-platform-tests/XMLHttpRequest/send-non-same-origin.sub-expected.txt:
* web-platform-tests/fetch/api/basic/mode-same-origin.any-expected.txt:
* web-platform-tests/fetch/api/basic/scheme-about.any-expected.txt:
* web-platform-tests/fetch/api/basic/scheme-about.any.worker-expected.txt:
* web-platform-tests/fetch/api/basic/scheme-blob-expected.txt:
* web-platform-tests/fetch/api/basic/scheme-others-expected.txt:
* web-platform-tests/fetch/api/cors/cors-basic.any-expected.txt:
* web-platform-tests/fetch/api/cors/cors-multiple-origins-expected.txt:
* web-platform-tests/fetch/api/cors/cors-origin.any.worker-expected.txt:
* web-platform-tests/fetch/api/cors/cors-preflight-redirect.any.worker-expected.txt:
* web-platform-tests/fetch/api/cors/cors-preflight-star.any-expected.txt:
* web-platform-tests/fetch/api/cors/cors-preflight-star.any.worker-expected.txt:
* web-platform-tests/fetch/api/cors/cors-preflight-status.any.worker-expected.txt:
* web-platform-tests/fetch/api/cors/cors-preflight.any.worker-expected.txt:
* web-platform-tests/fetch/api/cors/cors-redirect-preflight.any.worker-expected.txt:
* web-platform-tests/fetch/api/redirect/redirect-schemes-expected.txt:
* web-platform-tests/fetch/api/redirect/redirect-to-dataurl-expected.txt:
* web-platform-tests/fetch/api/request/request-keepalive-quota-expected.txt:
* web-platform-tests/service-workers/service-worker/fetch-event-redirect.https-expected.txt:
* web-platform-tests/service-workers/service-worker/fetch-request-fallback.https-expected.txt:
Source/WebCore:
Covered by rebased tests.
Make EventSource, XHR and Fetch log error messages consistently.
This patch also prepares consistent error logging between WK1 and WK2 as WK2 NetworkProcess
will issue more and more errors in places different from WK1.
This is the reason for SubresourceLoader changes in this patch and DTL/didFail/preflightFailure changes.
Update ImageLoader error message to be more general than CORS.
* loader/CrossOriginPreflightChecker.cpp:
(WebCore::CrossOriginPreflightChecker::doPreflight): Add some more logging for consistency between WK1 and WK2.
(WebCore::CrossOriginPreflightChecker::validatePreflightResponse): Ditto.
* loader/DocumentThreadableLoader.cpp:
(WebCore::DocumentThreadableLoader::didFail):
(WebCore::DocumentThreadableLoader::preflightFailure):
(WebCore::DocumentThreadableLoader::logErrorAndFail):
* loader/ImageLoader.cpp:
(WebCore::ImageLoader::notifyFinished):
* loader/SubresourceLoader.cpp:
(WebCore::SubresourceLoader::didFail):
* loader/ThreadableLoader.cpp:
(WebCore::ThreadableLoader::logError):
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::load):
* loader/cache/CachedResourceRequestInitiators.cpp:
(WebCore::CachedResourceRequestInitiators::CachedResourceRequestInitiators):
* loader/cache/CachedResourceRequestInitiators.h:
* page/EventSource.cpp:
(WebCore::EventSource::connect):
(WebCore::EventSource::didFail):
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::didFail):
LayoutTests:
Removing JS console log output for some tests.
Updating tests according modified error logging.
* TestExpectations:
* http/tests/security/bypassing-cors-checks-for-extension-urls-expected.txt:
* http/tests/security/contentSecurityPolicy/connect-src-eventsource-redirect-to-blocked-expected.txt:
* http/tests/security/contentSecurityPolicy/connect-src-xmlhttprequest-redirect-to-blocked-expected.txt:
* http/tests/security/cross-origin-cached-images-expected.txt:
* http/tests/security/cross-origin-cached-images-parallel-expected.txt:
* http/tests/security/img-with-failed-cors-check-fails-to-load-expected.txt:
* http/tests/security/load-image-after-redirection-2-expected.txt:
* http/tests/security/load-image-after-redirection-expected.txt:
* http/tests/security/mixedContent/insecure-xhr-in-main-frame-expected.txt:
* http/tests/security/video-poster-cross-origin-crash-expected.txt:
* http/tests/security/video-poster-cross-origin-crash2-expected.txt:
* http/tests/xmlhttprequest/access-control-and-redirects-async-expected.txt:
* http/tests/xmlhttprequest/access-control-and-redirects-expected.txt:
* http/tests/xmlhttprequest/access-control-basic-denied-expected.txt:
* http/tests/xmlhttprequest/access-control-basic-denied-preflight-cache-expected.txt:
* http/tests/xmlhttprequest/access-control-basic-get-fail-non-simple-expected.txt:
* http/tests/xmlhttprequest/access-control-basic-non-simple-deny-cached-expected.txt:
* http/tests/xmlhttprequest/access-control-basic-post-fail-non-simple-content-type-expected.txt:
* http/tests/xmlhttprequest/access-control-preflight-async-header-denied-expected.txt:
* http/tests/xmlhttprequest/access-control-preflight-async-method-denied-expected.txt:
* http/tests/xmlhttprequest/access-control-preflight-async-not-supported-expected.txt:
* http/tests/xmlhttprequest/access-control-preflight-not-successful-expected.txt:
* http/tests/xmlhttprequest/access-control-preflight-sync-header-denied-expected.txt:
* http/tests/xmlhttprequest/access-control-preflight-sync-method-denied-expected.txt:
* http/tests/xmlhttprequest/access-control-preflight-sync-not-supported-expected.txt:
* http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-expected.txt:
* http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-without-wildcard-expected.txt:
* http/tests/xmlhttprequest/cors-non-standard-safelisted-headers-should-trigger-preflight-expected.txt:
* http/tests/xmlhttprequest/cross-origin-no-authorization-expected.txt:
* http/tests/xmlhttprequest/cross-site-denied-response-sync-2-expected.txt:
* http/tests/xmlhttprequest/cross-site-denied-response-sync-expected.txt:
* http/tests/xmlhttprequest/origin-exact-matching-expected.txt:
* http/tests/xmlhttprequest/origin-whitelisting-https-expected.txt:
* http/tests/xmlhttprequest/origin-whitelisting-ip-addresses-with-subdomains-expected.txt:
* http/tests/xmlhttprequest/origin-whitelisting-removal-expected.txt:
* http/tests/xmlhttprequest/post-blob-content-type-sync-expected.txt:
* http/tests/xmlhttprequest/redirect-cross-origin-post-expected.txt:
* http/tests/xmlhttprequest/redirect-cross-origin-post-sync-expected.txt:
* http/tests/xmlhttprequest/redirect-cross-origin-sync-expected.txt:
* http/tests/xmlhttprequest/redirect-cross-origin-tripmine-expected.txt:
* http/tests/xmlhttprequest/simple-cross-origin-denied-events-post-expected.txt:
* http/tests/xmlhttprequest/simple-cross-origin-denied-events-post-sync-expected.txt:
* http/tests/xmlhttprequest/simple-cross-origin-denied-events-sync-expected.txt:
* http/tests/xmlhttprequest/simple-cross-origin-progress-events-expected.txt:
* http/tests/xmlhttprequest/upload-request-error-event-order-expected.txt:
* http/tests/xmlhttprequest/workers/access-control-basic-get-fail-non-simple-expected.txt:
* http/tests/xmlhttprequest/xmlhttprequest-sync-no-progress-events-expected.txt:
* http/tests/xmlhttprequest/xmlhttprequest-unsafe-redirect-expected.txt:
* platform/mac-wk1/http/tests/xmlhttprequest/access-control-and-redirects-expected.txt:
* platform/mac-wk1/http/tests/xmlhttprequest/access-control-preflight-not-successful-expected.txt:
* platform/mac-wk1/http/tests/xmlhttprequest/cross-origin-no-authorization-expected.txt:
* platform/mac-wk1/http/tests/xmlhttprequest/redirect-cross-origin-tripmine-expected.txt:
* platform/mac-wk1/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-expected.txt:
* platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-main-frame-expected.txt:
* platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-iframe-expected.txt:
* platform/win/http/tests/xmlhttprequest/access-control-and-redirects-expected.txt:
* platform/win/http/tests/xmlhttprequest/access-control-preflight-not-successful-expected.txt:
* platform/win/http/tests/xmlhttprequest/cross-origin-no-authorization-expected.txt:
* platform/win/http/tests/xmlhttprequest/redirect-cross-origin-tripmine-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@231000 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4dcd82d9..d1cee80 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,74 @@
+2018-04-25 Youenn Fablet <youenn@apple.com>
+
+ Make DocumentThreadableLoader error logging more consistent
+ https://bugs.webkit.org/show_bug.cgi?id=184853
+
+ Reviewed by Chris Dumez.
+
+ Removing JS console log output for some tests.
+ Updating tests according modified error logging.
+
+ * TestExpectations:
+ * http/tests/security/bypassing-cors-checks-for-extension-urls-expected.txt:
+ * http/tests/security/contentSecurityPolicy/connect-src-eventsource-redirect-to-blocked-expected.txt:
+ * http/tests/security/contentSecurityPolicy/connect-src-xmlhttprequest-redirect-to-blocked-expected.txt:
+ * http/tests/security/cross-origin-cached-images-expected.txt:
+ * http/tests/security/cross-origin-cached-images-parallel-expected.txt:
+ * http/tests/security/img-with-failed-cors-check-fails-to-load-expected.txt:
+ * http/tests/security/load-image-after-redirection-2-expected.txt:
+ * http/tests/security/load-image-after-redirection-expected.txt:
+ * http/tests/security/mixedContent/insecure-xhr-in-main-frame-expected.txt:
+ * http/tests/security/video-poster-cross-origin-crash-expected.txt:
+ * http/tests/security/video-poster-cross-origin-crash2-expected.txt:
+ * http/tests/xmlhttprequest/access-control-and-redirects-async-expected.txt:
+ * http/tests/xmlhttprequest/access-control-and-redirects-expected.txt:
+ * http/tests/xmlhttprequest/access-control-basic-denied-expected.txt:
+ * http/tests/xmlhttprequest/access-control-basic-denied-preflight-cache-expected.txt:
+ * http/tests/xmlhttprequest/access-control-basic-get-fail-non-simple-expected.txt:
+ * http/tests/xmlhttprequest/access-control-basic-non-simple-deny-cached-expected.txt:
+ * http/tests/xmlhttprequest/access-control-basic-post-fail-non-simple-content-type-expected.txt:
+ * http/tests/xmlhttprequest/access-control-preflight-async-header-denied-expected.txt:
+ * http/tests/xmlhttprequest/access-control-preflight-async-method-denied-expected.txt:
+ * http/tests/xmlhttprequest/access-control-preflight-async-not-supported-expected.txt:
+ * http/tests/xmlhttprequest/access-control-preflight-not-successful-expected.txt:
+ * http/tests/xmlhttprequest/access-control-preflight-sync-header-denied-expected.txt:
+ * http/tests/xmlhttprequest/access-control-preflight-sync-method-denied-expected.txt:
+ * http/tests/xmlhttprequest/access-control-preflight-sync-not-supported-expected.txt:
+ * http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-expected.txt:
+ * http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-without-wildcard-expected.txt:
+ * http/tests/xmlhttprequest/cors-non-standard-safelisted-headers-should-trigger-preflight-expected.txt:
+ * http/tests/xmlhttprequest/cross-origin-no-authorization-expected.txt:
+ * http/tests/xmlhttprequest/cross-site-denied-response-sync-2-expected.txt:
+ * http/tests/xmlhttprequest/cross-site-denied-response-sync-expected.txt:
+ * http/tests/xmlhttprequest/origin-exact-matching-expected.txt:
+ * http/tests/xmlhttprequest/origin-whitelisting-https-expected.txt:
+ * http/tests/xmlhttprequest/origin-whitelisting-ip-addresses-with-subdomains-expected.txt:
+ * http/tests/xmlhttprequest/origin-whitelisting-removal-expected.txt:
+ * http/tests/xmlhttprequest/post-blob-content-type-sync-expected.txt:
+ * http/tests/xmlhttprequest/redirect-cross-origin-post-expected.txt:
+ * http/tests/xmlhttprequest/redirect-cross-origin-post-sync-expected.txt:
+ * http/tests/xmlhttprequest/redirect-cross-origin-sync-expected.txt:
+ * http/tests/xmlhttprequest/redirect-cross-origin-tripmine-expected.txt:
+ * http/tests/xmlhttprequest/simple-cross-origin-denied-events-post-expected.txt:
+ * http/tests/xmlhttprequest/simple-cross-origin-denied-events-post-sync-expected.txt:
+ * http/tests/xmlhttprequest/simple-cross-origin-denied-events-sync-expected.txt:
+ * http/tests/xmlhttprequest/simple-cross-origin-progress-events-expected.txt:
+ * http/tests/xmlhttprequest/upload-request-error-event-order-expected.txt:
+ * http/tests/xmlhttprequest/workers/access-control-basic-get-fail-non-simple-expected.txt:
+ * http/tests/xmlhttprequest/xmlhttprequest-sync-no-progress-events-expected.txt:
+ * http/tests/xmlhttprequest/xmlhttprequest-unsafe-redirect-expected.txt:
+ * platform/mac-wk1/http/tests/xmlhttprequest/access-control-and-redirects-expected.txt:
+ * platform/mac-wk1/http/tests/xmlhttprequest/access-control-preflight-not-successful-expected.txt:
+ * platform/mac-wk1/http/tests/xmlhttprequest/cross-origin-no-authorization-expected.txt:
+ * platform/mac-wk1/http/tests/xmlhttprequest/redirect-cross-origin-tripmine-expected.txt:
+ * platform/mac-wk1/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-expected.txt:
+ * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-main-frame-expected.txt:
+ * platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-iframe-expected.txt:
+ * platform/win/http/tests/xmlhttprequest/access-control-and-redirects-expected.txt:
+ * platform/win/http/tests/xmlhttprequest/access-control-preflight-not-successful-expected.txt:
+ * platform/win/http/tests/xmlhttprequest/cross-origin-no-authorization-expected.txt:
+ * platform/win/http/tests/xmlhttprequest/redirect-cross-origin-tripmine-expected.txt:
+
2018-04-25 Dean Jackson <dino@apple.com>
Make a better flag for system preview, and disable it where necessary
diff --git a/LayoutTests/TestExpectations b/LayoutTests/TestExpectations
index 9435eb4..b562323 100644
--- a/LayoutTests/TestExpectations
+++ b/LayoutTests/TestExpectations
@@ -240,6 +240,13 @@
imported/w3c/web-platform-tests/workers/SharedWorker_blobUrl.html [ Skip ]
imported/w3c/web-platform-tests/fetch/api/redirect/redirect-mode.html [ DumpJSConsoleLogInStdErr ]
+imported/w3c/web-platform-tests/fetch/api/cors/cors-preflight-redirect.any.worker.html [ DumpJSConsoleLogInStdErr ]
+imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects.htm [ DumpJSConsoleLogInStdErr ]
+imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-cors-safelisted-request-headers.htm [ DumpJSConsoleLogInStdErr ]
+imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-get-fail-non-simple.htm [ DumpJSConsoleLogInStdErr ]
+imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-post-with-non-cors-safelisted-content-type.htm [ DumpJSConsoleLogInStdErr ]
+
+http/tests/security/cross-origin-cached-images-parallel.html [ DumpJSConsoleLogInStdErr ]
# textarea.animate is not supported
imported/w3c/web-platform-tests/css/css-ui/caret-color-018.html [ Skip ]
diff --git a/LayoutTests/fast/workers/worker-crash-with-invalid-location-expected.txt b/LayoutTests/fast/workers/worker-crash-with-invalid-location-expected.txt
index 48b05e3..3285d3c 100644
--- a/LayoutTests/fast/workers/worker-crash-with-invalid-location-expected.txt
+++ b/LayoutTests/fast/workers/worker-crash-with-invalid-location-expected.txt
@@ -1,4 +1,5 @@
Blocked access to external URL http://example.com/worker.js
+CONSOLE MESSAGE: line 18: Cannot load http://example.com/worker.js due to access control checks.
Test worker fetch of blocked url. Should print a "PASS" statement.
PASS
diff --git a/LayoutTests/fast/xmlhttprequest/xmlhttprequest-no-file-access-expected.txt b/LayoutTests/fast/xmlhttprequest/xmlhttprequest-no-file-access-expected.txt
index 1f4ac2b..178b1aa 100644
--- a/LayoutTests/fast/xmlhttprequest/xmlhttprequest-no-file-access-expected.txt
+++ b/LayoutTests/fast/xmlhttprequest/xmlhttprequest-no-file-access-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: line 23: XMLHttpRequest cannot load xmlhttprequest-no-file-access-expected.txt. Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 23: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 23: XMLHttpRequest cannot load xmlhttprequest-no-file-access-expected.txt due to access control checks.
The child iframe cannot paste its textual results into this iframe because it is considered a different domain - that's the point of this test! Therefore, success is denoted by the child iframe calling notifyDone. The test will hang if something goes amiss with the access control checks.
diff --git a/LayoutTests/fast/xmlhttprequest/xmlhttprequest-nonexistent-file-expected.txt b/LayoutTests/fast/xmlhttprequest/xmlhttprequest-nonexistent-file-expected.txt
index ec7ecfb..7d4af2b 100644
--- a/LayoutTests/fast/xmlhttprequest/xmlhttprequest-nonexistent-file-expected.txt
+++ b/LayoutTests/fast/xmlhttprequest/xmlhttprequest-nonexistent-file-expected.txt
@@ -1,5 +1,6 @@
CONSOLE MESSAGE: line 64: Not allowed to load local resource: nonexistent.html
-CONSOLE MESSAGE: line 64: XMLHttpRequest cannot load nonexistent.html. Not allowed to request resource
+CONSOLE MESSAGE: line 64: Not allowed to request resource
+CONSOLE MESSAGE: line 64: XMLHttpRequest cannot load nonexistent.html due to access control checks.
Bug 22475: REGRESSION: Async XMLHttpRequest never finishes on nonexistent files anymore
diff --git a/LayoutTests/http/tests/contentextensions/async-xhr-onerror-expected.txt b/LayoutTests/http/tests/contentextensions/async-xhr-onerror-expected.txt
index d40b123..f5f76462 100644
--- a/LayoutTests/http/tests/contentextensions/async-xhr-onerror-expected.txt
+++ b/LayoutTests/http/tests/contentextensions/async-xhr-onerror-expected.txt
@@ -1,7 +1,9 @@
CONSOLE MESSAGE: line 30: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/async-xhr-onerror.html from loading a resource from http://127.0.0.1:8000/contentextensions/resources/url-blocking-test.js
-CONSOLE MESSAGE: line 30: XMLHttpRequest cannot load http://127.0.0.1:8000/contentextensions/resources/url-blocking-test.js. Resource blocked by content blocker
+CONSOLE MESSAGE: line 30: Resource blocked by content blocker
+CONSOLE MESSAGE: line 30: XMLHttpRequest cannot load http://127.0.0.1:8000/contentextensions/resources/url-blocking-test.js due to access control checks.
CONSOLE MESSAGE: line 30: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/async-xhr-onerror.html from loading a resource from http://127.0.0.1:8000/contentextensions/resources/url-blocking-test.js
-CONSOLE MESSAGE: line 30: XMLHttpRequest cannot load http://127.0.0.1:8000/contentextensions/resources/url-blocking-test.js. Resource blocked by content blocker
+CONSOLE MESSAGE: line 30: Resource blocked by content blocker
+CONSOLE MESSAGE: line 30: XMLHttpRequest cannot load http://127.0.0.1:8000/contentextensions/resources/url-blocking-test.js due to access control checks.
Asynchronous onreadystatechange status: 0, readyState:1, responseText:
Finished runTest. Waiting for callbacks
Asynchronous onreadystatechange status: 0, readyState:1, responseText:
diff --git a/LayoutTests/http/tests/contentextensions/sync-xhr-blocked-expected.txt b/LayoutTests/http/tests/contentextensions/sync-xhr-blocked-expected.txt
index d2ce257..195f374 100644
--- a/LayoutTests/http/tests/contentextensions/sync-xhr-blocked-expected.txt
+++ b/LayoutTests/http/tests/contentextensions/sync-xhr-blocked-expected.txt
@@ -1,5 +1,5 @@
CONSOLE MESSAGE: line 21: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/sync-xhr-blocked.html from loading a resource from http://127.0.0.1:8000/contentextensions/resources/url-blocking-test.js
-CONSOLE MESSAGE: line 21: XMLHttpRequest cannot load http://127.0.0.1:8000/contentextensions/resources/url-blocking-test.js.
+CONSOLE MESSAGE: line 21: XMLHttpRequest cannot load http://127.0.0.1:8000/contentextensions/resources/url-blocking-test.js.
Synchronous status: 0, readyState:1, responseText:
Synchronous status: 0, readyState:4, responseText:
Synchronous error: NetworkError: A network error occurred.
diff --git a/LayoutTests/http/tests/contentextensions/sync-xhr-redirection-blocked-expected.txt b/LayoutTests/http/tests/contentextensions/sync-xhr-redirection-blocked-expected.txt
index 98cf29c..ffbeb82 100644
--- a/LayoutTests/http/tests/contentextensions/sync-xhr-redirection-blocked-expected.txt
+++ b/LayoutTests/http/tests/contentextensions/sync-xhr-redirection-blocked-expected.txt
@@ -1,5 +1,5 @@
CONSOLE MESSAGE: line 22: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/sync-xhr-redirection-blocked.html from loading a resource from http://127.0.0.1:8000/resources/redirect.php?url=/contentextensions/resources/url-blocking-test.js
-CONSOLE MESSAGE: line 22: XMLHttpRequest cannot load http://127.0.0.1:8000/resources/redirect.php?url=/contentextensions/resources/url-blocking-test.js.
+CONSOLE MESSAGE: line 22: XMLHttpRequest cannot load http://127.0.0.1:8000/resources/redirect.php?url=/contentextensions/resources/url-blocking-test.js.
Synchronous status: 0, readyState:1, responseText:
Synchronous status: 0, readyState:4, responseText:
Synchronous error: NetworkError: A network error occurred.
diff --git a/LayoutTests/http/tests/eventsource/eventsource-cors-basic-expected.txt b/LayoutTests/http/tests/eventsource/eventsource-cors-basic-expected.txt
index 038aa07..26f3b03 100644
--- a/LayoutTests/http/tests/eventsource/eventsource-cors-basic-expected.txt
+++ b/LayoutTests/http/tests/eventsource/eventsource-cors-basic-expected.txt
@@ -1,7 +1,7 @@
CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: EventSource cannot load http://localhost:8000/eventsource/resources/es-cors-basic.php?count=1. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: EventSource cannot load http://localhost:8000/eventsource/resources/es-cors-basic.php?count=1 due to access control checks.
CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: EventSource cannot load http://localhost:8000/eventsource/resources/es-cors-basic.php?count=2. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: EventSource cannot load http://localhost:8000/eventsource/resources/es-cors-basic.php?count=2 due to access control checks.
Test that basic EventSource cross-origin requests fail until they are allowed by the Access-Control-Allow-Origin header. Should print a series of PASS messages followed by DONE.
PASS: got error event and readyState is CLOSED
diff --git a/LayoutTests/http/tests/eventsource/eventsource-cors-non-http-expected.txt b/LayoutTests/http/tests/eventsource/eventsource-cors-non-http-expected.txt
index 78816af..e461a2c 100644
--- a/LayoutTests/http/tests/eventsource/eventsource-cors-non-http-expected.txt
+++ b/LayoutTests/http/tests/eventsource/eventsource-cors-non-http-expected.txt
@@ -1,7 +1,11 @@
-CONSOLE MESSAGE: EventSource cannot load ftp://127.0.0.1/. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: EventSource cannot load motd. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: EventSource cannot load localhost:8080/. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: EventSource cannot load tel:1234. Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: EventSource cannot load ftp://127.0.0.1/ due to access control checks.
+CONSOLE MESSAGE: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: EventSource cannot load motd due to access control checks.
+CONSOLE MESSAGE: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: EventSource cannot load localhost:8080/ due to access control checks.
+CONSOLE MESSAGE: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: EventSource cannot load tel:1234 due to access control checks.
Test EventSource with non-HTTP protocol schemes in the URL. Should print a series of PASS messages followed by DONE.
PASS: got error event and readyState is CLOSED
diff --git a/LayoutTests/http/tests/eventsource/eventsource-cors-with-credentials-expected.txt b/LayoutTests/http/tests/eventsource/eventsource-cors-with-credentials-expected.txt
index 63a6a531..8e94963 100644
--- a/LayoutTests/http/tests/eventsource/eventsource-cors-with-credentials-expected.txt
+++ b/LayoutTests/http/tests/eventsource/eventsource-cors-with-credentials-expected.txt
@@ -1,9 +1,9 @@
CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
-CONSOLE MESSAGE: EventSource cannot load http://localhost:8000/eventsource/resources/es-cors-credentials.php?count=1. Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
+CONSOLE MESSAGE: EventSource cannot load http://localhost:8000/eventsource/resources/es-cors-credentials.php?count=1 due to access control checks.
CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
-CONSOLE MESSAGE: EventSource cannot load http://localhost:8000/eventsource/resources/es-cors-credentials.php?count=2. Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
+CONSOLE MESSAGE: EventSource cannot load http://localhost:8000/eventsource/resources/es-cors-credentials.php?count=2 due to access control checks.
CONSOLE MESSAGE: Credentials flag is true, but Access-Control-Allow-Credentials is not "true".
-CONSOLE MESSAGE: EventSource cannot load http://localhost:8000/eventsource/resources/es-cors-credentials.php?count=3. Credentials flag is true, but Access-Control-Allow-Credentials is not "true".
+CONSOLE MESSAGE: EventSource cannot load http://localhost:8000/eventsource/resources/es-cors-credentials.php?count=3 due to access control checks.
Test that EventSource cross-origin requests with credentials fail until the correct CORS headers are sent. Should print a series of PASS messages followed by DONE.
PASS: got error event and readyState is CLOSED
diff --git a/LayoutTests/http/tests/eventsource/eventsource-reconnect-during-navigate-crash-expected.txt b/LayoutTests/http/tests/eventsource/eventsource-reconnect-during-navigate-crash-expected.txt
index 95b9dab..41c9654 100644
--- a/LayoutTests/http/tests/eventsource/eventsource-reconnect-during-navigate-crash-expected.txt
+++ b/LayoutTests/http/tests/eventsource/eventsource-reconnect-during-navigate-crash-expected.txt
@@ -1,2 +1,2 @@
-CONSOLE MESSAGE: EventSource cannot load http://127.0.0.1:8000/eventsource/resources/reconnect.php.
+CONSOLE MESSAGE: EventSource cannot load http://127.0.0.1:8000/eventsource/resources/reconnect.php due to access control checks.
diff --git a/LayoutTests/http/tests/fetch/redirectmode-and-preload-expected.txt b/LayoutTests/http/tests/fetch/redirectmode-and-preload-expected.txt
index ac99d05..4ab5519 100644
--- a/LayoutTests/http/tests/fetch/redirectmode-and-preload-expected.txt
+++ b/LayoutTests/http/tests/fetch/redirectmode-and-preload-expected.txt
@@ -1,8 +1,10 @@
CONSOLE MESSAGE: line 19: No-Cors mode requires follow redirect mode
-CONSOLE MESSAGE: line 19: Fetch API cannot load http://127.0.0.1:8000/fetch/resources/redirect-with-cache.php?enableCaching&url=http://localhost:8000/security/resources/allow-if-origin.php?allowCache&origin=http%3A%2F%2F127.0.0.1%3A8000&name=alert-fail.js&contentType=text/ascii. Not allowed to request resource
+CONSOLE MESSAGE: line 19: Not allowed to request resource
+CONSOLE MESSAGE: line 19: Fetch API cannot load http://127.0.0.1:8000/fetch/resources/redirect-with-cache.php?enableCaching&url=http://localhost:8000/security/resources/allow-if-origin.php?allowCache&origin=http%3A%2F%2F127.0.0.1%3A8000&name=alert-fail.js&contentType=text/ascii due to access control checks.
CONSOLE MESSAGE: line 32: No-Cors mode requires follow redirect mode
-CONSOLE MESSAGE: line 32: Fetch API cannot load http://127.0.0.1:8000/fetch/resources/redirect-with-cache.php?enableCaching&url=http://localhost:8000/security/resources/allow-if-origin.php?allowCache&origin=http%3A%2F%2F127.0.0.1%3A8000&name=alert-fail.js&contentType=text/ascii. Not allowed to request resource
-CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8000/fetch/resources/redirect-with-cache.php?enableCaching&url=http://localhost:8000/security/resources/allow-if-origin.php?allowCache&origin=http%3A%2F%2F127.0.0.1%3A8000&name=alert-fail.js&contentType=text/ascii. Redirections are not allowed
+CONSOLE MESSAGE: line 32: Not allowed to request resource
+CONSOLE MESSAGE: line 32: Fetch API cannot load http://127.0.0.1:8000/fetch/resources/redirect-with-cache.php?enableCaching&url=http://localhost:8000/security/resources/allow-if-origin.php?allowCache&origin=http%3A%2F%2F127.0.0.1%3A8000&name=alert-fail.js&contentType=text/ascii due to access control checks.
+CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8000/fetch/resources/redirect-with-cache.php?enableCaching&url=http://localhost:8000/security/resources/allow-if-origin.php?allowCache&origin=http%3A%2F%2F127.0.0.1%3A8000&name=alert-fail.js&contentType=text/ascii due to access control checks.
PASS Fetch should check for redirections even if resource is preloaded (same fetch options except for redirect mode)
PASS Fetch should check for redirections even if resource is preloaded (different fetch mode, different redirect mode)
diff --git a/LayoutTests/http/tests/from-origin/fetch-data-iframe-from-origin-same-blocked-expected.txt b/LayoutTests/http/tests/from-origin/fetch-data-iframe-from-origin-same-blocked-expected.txt
index 3e2d62f..8fc51cd 100644
--- a/LayoutTests/http/tests/from-origin/fetch-data-iframe-from-origin-same-blocked-expected.txt
+++ b/LayoutTests/http/tests/from-origin/fetch-data-iframe-from-origin-same-blocked-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8000/from-origin/resources/fetch.php?fromOrigin=same. Cancelled load because it violates the resource's From-Origin response header.
+CONSOLE MESSAGE: Cancelled load because it violates the resource's From-Origin response header.
+CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8000/from-origin/resources/fetch.php?fromOrigin=same due to access control checks.
Tests that a cross-origin fetch in a data: iframe load fails if the server blocks cross-origin loads with a 'From-Origin: same' response header.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
diff --git a/LayoutTests/http/tests/from-origin/fetch-from-origin-same-blocked-expected.txt b/LayoutTests/http/tests/from-origin/fetch-from-origin-same-blocked-expected.txt
index 30a5eee..24e5ed8 100644
--- a/LayoutTests/http/tests/from-origin/fetch-from-origin-same-blocked-expected.txt
+++ b/LayoutTests/http/tests/from-origin/fetch-from-origin-same-blocked-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8000/from-origin/resources/fetch.php?fromOrigin=same. Cancelled load because it violates the resource's From-Origin response header.
+CONSOLE MESSAGE: Cancelled load because it violates the resource's From-Origin response header.
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8000/from-origin/resources/fetch.php?fromOrigin=same due to access control checks.
Tests that a cross-origin fetch load fails if the server blocks it with a 'From-Origin: same' response header, even though the server includes an Access-Control-Allow-Origin response header.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
diff --git a/LayoutTests/http/tests/from-origin/fetch-from-origin-same-site-blocked-expected.txt b/LayoutTests/http/tests/from-origin/fetch-from-origin-same-site-blocked-expected.txt
index 9b986da..7b3be6e 100644
--- a/LayoutTests/http/tests/from-origin/fetch-from-origin-same-site-blocked-expected.txt
+++ b/LayoutTests/http/tests/from-origin/fetch-from-origin-same-site-blocked-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8000/from-origin/resources/fetch.php?fromOrigin=same-site. Cancelled load because it violates the resource's From-Origin response header.
+CONSOLE MESSAGE: Cancelled load because it violates the resource's From-Origin response header.
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8000/from-origin/resources/fetch.php?fromOrigin=same-site due to access control checks.
Tests that a cross-origin fetch load fails if the server blocks it with a 'From-Origin: same-site' response header, even though the server includes an Access-Control-Allow-Origin response header.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
diff --git a/LayoutTests/http/tests/from-origin/fetch-iframe-from-origin-same-blocked-expected.txt b/LayoutTests/http/tests/from-origin/fetch-iframe-from-origin-same-blocked-expected.txt
index 2a65c6f..12bd4ac 100644
--- a/LayoutTests/http/tests/from-origin/fetch-iframe-from-origin-same-blocked-expected.txt
+++ b/LayoutTests/http/tests/from-origin/fetch-iframe-from-origin-same-blocked-expected.txt
@@ -1,5 +1,7 @@
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8000/from-origin/resources/fetch.php?fromOrigin=same. Cancelled load because it violates the resource's From-Origin response header.
-CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8000/from-origin/resources/fetch.php?fromOrigin=same. Cancelled load because it violates the resource's From-Origin response header.
+CONSOLE MESSAGE: Cancelled load because it violates the resource's From-Origin response header.
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8000/from-origin/resources/fetch.php?fromOrigin=same due to access control checks.
+CONSOLE MESSAGE: Cancelled load because it violates the resource's From-Origin response header.
+CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8000/from-origin/resources/fetch.php?fromOrigin=same due to access control checks.
Tests that a cross-origin fetch in an iframe load fails if the server blocks cross-origin loads with a 'From-Origin: same' response header.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
diff --git a/LayoutTests/http/tests/from-origin/image-about-blank-from-origin-same-blocked-expected.txt b/LayoutTests/http/tests/from-origin/image-about-blank-from-origin-same-blocked-expected.txt
index 32def21..b9bd4b7 100644
--- a/LayoutTests/http/tests/from-origin/image-about-blank-from-origin-same-blocked-expected.txt
+++ b/LayoutTests/http/tests/from-origin/image-about-blank-from-origin-same-blocked-expected.txt
@@ -1,5 +1,5 @@
CONSOLE MESSAGE: Cancelled load because it violates the resource's From-Origin response header.
-CONSOLE MESSAGE: Cross-origin image load denied by Cross-Origin Resource Sharing policy.
+CONSOLE MESSAGE: Cannot load image http://localhost:8000/from-origin/resources/image.php?fromOrigin=same due to access control checks.
Tests that a cross-origin image load inside an about:blank iframe fails if the server blocks it with a 'From-Origin: same' response header.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
diff --git a/LayoutTests/http/tests/from-origin/image-from-origin-same-blocked-expected.txt b/LayoutTests/http/tests/from-origin/image-from-origin-same-blocked-expected.txt
index ad23d99..ff0c2b8 100644
--- a/LayoutTests/http/tests/from-origin/image-from-origin-same-blocked-expected.txt
+++ b/LayoutTests/http/tests/from-origin/image-from-origin-same-blocked-expected.txt
@@ -1,5 +1,5 @@
CONSOLE MESSAGE: Cancelled load because it violates the resource's From-Origin response header.
-CONSOLE MESSAGE: Cross-origin image load denied by Cross-Origin Resource Sharing policy.
+CONSOLE MESSAGE: Cannot load image http://localhost:8000/from-origin/resources/image.php?fromOrigin=same due to access control checks.
Tests that a cross-origin image load fails if the server blocks it with a 'From-Origin: same' response header.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
diff --git a/LayoutTests/http/tests/from-origin/image-from-origin-same-site-blocked-expected.txt b/LayoutTests/http/tests/from-origin/image-from-origin-same-site-blocked-expected.txt
index a972c85..23e19e9 100644
--- a/LayoutTests/http/tests/from-origin/image-from-origin-same-site-blocked-expected.txt
+++ b/LayoutTests/http/tests/from-origin/image-from-origin-same-site-blocked-expected.txt
@@ -1,5 +1,5 @@
CONSOLE MESSAGE: Cancelled load because it violates the resource's From-Origin response header.
-CONSOLE MESSAGE: Cross-origin image load denied by Cross-Origin Resource Sharing policy.
+CONSOLE MESSAGE: Cannot load image http://localhost:8000/from-origin/resources/image.php?fromOrigin=same-site due to access control checks.
Tests that a cross-origin image load fails if the server blocks it with a 'From-Origin: same-site' response header.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
diff --git a/LayoutTests/http/tests/from-origin/redirect-fetch-from-origin-same-blocked-expected.txt b/LayoutTests/http/tests/from-origin/redirect-fetch-from-origin-same-blocked-expected.txt
index 35386c5..16802a5 100644
--- a/LayoutTests/http/tests/from-origin/redirect-fetch-from-origin-same-blocked-expected.txt
+++ b/LayoutTests/http/tests/from-origin/redirect-fetch-from-origin-same-blocked-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8000/from-origin/resources/fetch.php?fromOrigin=same. Cancelled load because it violates the resource's From-Origin response header.
+CONSOLE MESSAGE: Cancelled load because it violates the resource's From-Origin response header.
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8000/from-origin/resources/fetch.php?fromOrigin=same due to access control checks.
Tests that a redirected cross-origin fetch load fails if the server blocks it with a 'From-Origin: same' response header, even though the server includes an Access-Control-Allow-Origin response header.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
diff --git a/LayoutTests/http/tests/from-origin/redirect-image-from-origin-same-blocked-expected.txt b/LayoutTests/http/tests/from-origin/redirect-image-from-origin-same-blocked-expected.txt
index c2c6d0f..8cb0917 100644
--- a/LayoutTests/http/tests/from-origin/redirect-image-from-origin-same-blocked-expected.txt
+++ b/LayoutTests/http/tests/from-origin/redirect-image-from-origin-same-blocked-expected.txt
@@ -1,5 +1,5 @@
CONSOLE MESSAGE: Cancelled load because it violates the resource's From-Origin response header.
-CONSOLE MESSAGE: Cross-origin image load denied by Cross-Origin Resource Sharing policy.
+CONSOLE MESSAGE: Cannot load image http://127.0.0.1:8000/from-origin/resources/redirect.php?redirectTo=http://localhost:8000/from-origin/resources/image.php?fromOrigin=same due to access control checks.
Tests that a redirected cross-origin image load fails if the server blocks it with a 'From-Origin: same' response header.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
diff --git a/LayoutTests/http/tests/from-origin/redirect-xhr-from-origin-same-blocked-expected.txt b/LayoutTests/http/tests/from-origin/redirect-xhr-from-origin-same-blocked-expected.txt
index cb31428..2c51451 100644
--- a/LayoutTests/http/tests/from-origin/redirect-xhr-from-origin-same-blocked-expected.txt
+++ b/LayoutTests/http/tests/from-origin/redirect-xhr-from-origin-same-blocked-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/from-origin/resources/xhr.php?fromOrigin=same. Cancelled load because it violates the resource's From-Origin response header.
+CONSOLE MESSAGE: Cancelled load because it violates the resource's From-Origin response header.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/from-origin/resources/xhr.php?fromOrigin=same due to access control checks.
Tests that a redirected cross-origin xhr load fails if the server blocks it with a 'From-Origin: same' response header, even though the server includes an Access-Control-Allow-Origin response header.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
diff --git a/LayoutTests/http/tests/from-origin/xhr-from-origin-same-blocked-expected.txt b/LayoutTests/http/tests/from-origin/xhr-from-origin-same-blocked-expected.txt
index 786aafe..624cc4c 100644
--- a/LayoutTests/http/tests/from-origin/xhr-from-origin-same-blocked-expected.txt
+++ b/LayoutTests/http/tests/from-origin/xhr-from-origin-same-blocked-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/from-origin/resources/xhr.php?fromOrigin=same. Cancelled load because it violates the resource's From-Origin response header.
+CONSOLE MESSAGE: Cancelled load because it violates the resource's From-Origin response header.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/from-origin/resources/xhr.php?fromOrigin=same due to access control checks.
Tests that a cross-origin xhr load fails if the server blocks it with a 'From-Origin: same' response header, even though the server includes an Access-Control-Allow-Origin response header.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
diff --git a/LayoutTests/http/tests/from-origin/xhr-from-origin-same-site-blocked-expected.txt b/LayoutTests/http/tests/from-origin/xhr-from-origin-same-site-blocked-expected.txt
index 65e6a6a..c7beabb 100644
--- a/LayoutTests/http/tests/from-origin/xhr-from-origin-same-site-blocked-expected.txt
+++ b/LayoutTests/http/tests/from-origin/xhr-from-origin-same-site-blocked-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/from-origin/resources/xhr.php?fromOrigin=same-site. Cancelled load because it violates the resource's From-Origin response header.
+CONSOLE MESSAGE: Cancelled load because it violates the resource's From-Origin response header.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/from-origin/resources/xhr.php?fromOrigin=same-site due to access control checks.
Tests that a cross-origin xhr load fails if the server blocks it with a 'From-Origin: same-site' response header, even though the server includes an Access-Control-Allow-Origin response header.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
diff --git a/LayoutTests/http/tests/inspector/network/fetch-network-data-expected.txt b/LayoutTests/http/tests/inspector/network/fetch-network-data-expected.txt
index fb6ea17..43a4e60 100644
--- a/LayoutTests/http/tests/inspector/network/fetch-network-data-expected.txt
+++ b/LayoutTests/http/tests/inspector/network/fetch-network-data-expected.txt
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 2: Fetch API cannot load http://localhost:8000/inspector/network/resources/cors-data.pl. Cross origin requests are not allowed when using same-origin fetch mode.
+CONSOLE MESSAGE: line 2: Fetch API cannot load http://localhost:8000/inspector/network/resources/cors-data.pl.
Tests for Network data with different types of Fetch requests.
diff --git a/LayoutTests/http/tests/inspector/network/loadResource-insecure-resource-expected.txt b/LayoutTests/http/tests/inspector/network/loadResource-insecure-resource-expected.txt
index 4b3125d..e86482f 100644
--- a/LayoutTests/http/tests/inspector/network/loadResource-insecure-resource-expected.txt
+++ b/LayoutTests/http/tests/inspector/network/loadResource-insecure-resource-expected.txt
@@ -1,5 +1,7 @@
CONSOLE MESSAGE: [blocked] The page at https://127.0.0.1:8443/inspector/network/loadResource-insecure-resource.html was not allowed to display insecure content from http://127.0.0.0:8000/inspector/network/resources/data.json?2.
+CONSOLE MESSAGE: Not allowed to request resource
+CONSOLE MESSAGE: Cannot load http://127.0.0.0:8000/inspector/network/resources/data.json?2 due to access control checks.
Tests loading resources on a secure page with Network.loadResource.
diff --git a/LayoutTests/http/tests/security/bypassing-cors-checks-for-extension-urls-expected.txt b/LayoutTests/http/tests/security/bypassing-cors-checks-for-extension-urls-expected.txt
index 6a3b73e..4bbbecd 100644
--- a/LayoutTests/http/tests/security/bypassing-cors-checks-for-extension-urls-expected.txt
+++ b/LayoutTests/http/tests/security/bypassing-cors-checks-for-extension-urls-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: line 19: XMLHttpRequest cannot load safari-extension://test1. Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 19: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 19: XMLHttpRequest cannot load safari-extension://test1 due to access control checks.
This test ensures that XHR/Fetch will bypass CORS for user extension URLS in case the page is running user scripts.
diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-iframe-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-iframe-expected.txt
index 89516e3..dcdec79 100644
--- a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-iframe-expected.txt
+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-iframe-expected.txt
@@ -2,7 +2,8 @@
main frame - didFinishDocumentLoadForFrame
frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
CONSOLE MESSAGE: Blocked mixed content http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi because 'block-all-mixed-content' appears in the Content Security Policy.
-CONSOLE MESSAGE: line 30: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi. Not allowed to request resource
+CONSOLE MESSAGE: line 30: Not allowed to request resource
+CONSOLE MESSAGE: line 30: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi due to access control checks.
frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
main frame - didHandleOnloadEventsForFrame
diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-main-frame-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-main-frame-expected.txt
index 3f6476f0..1043e04 100644
--- a/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-main-frame-expected.txt
+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-main-frame-expected.txt
@@ -4,7 +4,8 @@
main frame - didFinishLoadForFrame
main frame - didCommitLoadForFrame
CONSOLE MESSAGE: Blocked mixed content http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi because 'block-all-mixed-content' appears in the Content Security Policy.
-CONSOLE MESSAGE: line 30: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi. Not allowed to request resource
+CONSOLE MESSAGE: line 30: Not allowed to request resource
+CONSOLE MESSAGE: line 30: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi due to access control checks.
main frame - didFinishDocumentLoadForFrame
main frame - didHandleOnloadEventsForFrame
main frame - didFinishLoadForFrame
diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/connect-src-eventsource-redirect-to-blocked-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/connect-src-eventsource-redirect-to-blocked-expected.txt
index 74a616f..49f2671 100644
--- a/LayoutTests/http/tests/security/contentSecurityPolicy/connect-src-eventsource-redirect-to-blocked-expected.txt
+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/connect-src-eventsource-redirect-to-blocked-expected.txt
@@ -1,5 +1,6 @@
CONSOLE MESSAGE: Refused to connect to http://localhost:8000/eventsource/resources/simple-event-stream.asis because it does not appear in the connect-src directive of the Content Security Policy.
-CONSOLE MESSAGE: EventSource cannot load http://127.0.0.1:8000/security/contentSecurityPolicy/resources/redir.php?url=http://localhost:8000/eventsource/resources/simple-event-stream.asis. Cross-origin redirection denied by Content Security Policy.
+CONSOLE MESSAGE: Cross-origin redirection denied by Content Security Policy.
+CONSOLE MESSAGE: EventSource cannot load http://127.0.0.1:8000/security/contentSecurityPolicy/resources/redir.php?url=http://localhost:8000/eventsource/resources/simple-event-stream.asis due to access control checks.
PASS EventSource() did not follow the disallowed redirect.
PASS successfullyParsed is true
diff --git a/LayoutTests/http/tests/security/contentSecurityPolicy/connect-src-xmlhttprequest-redirect-to-blocked-expected.txt b/LayoutTests/http/tests/security/contentSecurityPolicy/connect-src-xmlhttprequest-redirect-to-blocked-expected.txt
index 4730b2a..8ecc3cb 100644
--- a/LayoutTests/http/tests/security/contentSecurityPolicy/connect-src-xmlhttprequest-redirect-to-blocked-expected.txt
+++ b/LayoutTests/http/tests/security/contentSecurityPolicy/connect-src-xmlhttprequest-redirect-to-blocked-expected.txt
@@ -1,5 +1,6 @@
CONSOLE MESSAGE: Refused to connect to http://localhost:8000/security/contentSecurityPolicy/resources/xhr-redirect-not-allowed.pl because it does not appear in the connect-src directive of the Content Security Policy.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8000/security/contentSecurityPolicy/resources/redir.php?url=http://localhost:8000/security/contentSecurityPolicy/resources/xhr-redirect-not-allowed.pl. Cross-origin redirection denied by Content Security Policy.
+CONSOLE MESSAGE: Cross-origin redirection denied by Content Security Policy.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8000/security/contentSecurityPolicy/resources/redir.php?url=http://localhost:8000/security/contentSecurityPolicy/resources/xhr-redirect-not-allowed.pl due to access control checks.
PASS XMLHttpRequest.send() did not follow the disallowed redirect.
PASS successfullyParsed is true
diff --git a/LayoutTests/http/tests/security/cross-origin-cached-images-expected.txt b/LayoutTests/http/tests/security/cross-origin-cached-images-expected.txt
index aad0512..f2ac599 100644
--- a/LayoutTests/http/tests/security/cross-origin-cached-images-expected.txt
+++ b/LayoutTests/http/tests/security/cross-origin-cached-images-expected.txt
@@ -1,7 +1,7 @@
CONSOLE MESSAGE: Origin http://localhost:8080 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Cross-origin image load denied by Cross-Origin Resource Sharing policy.
+CONSOLE MESSAGE: Cannot load image http://127.0.0.1:8000/security/resources/allow-if-origin.php?allowCache&origin=http%3A%2F%2Flocalhost%3A8000 due to access control checks.
CONSOLE MESSAGE: Origin http://localhost:8080 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Cross-origin image load denied by Cross-Origin Resource Sharing policy.
+CONSOLE MESSAGE: Cannot load image http://127.0.0.1:8080/security/resources/allow-if-origin.php?allowCache&origin=http%3A%2F%2Flocalhost%3A8000 due to access control checks.
Tests source origin difference for cached resources.
Trying to load sequentially the same image from different origins.
diff --git a/LayoutTests/http/tests/security/cross-origin-cached-images-parallel-expected.txt b/LayoutTests/http/tests/security/cross-origin-cached-images-parallel-expected.txt
index 0bc0505..3afaecf 100644
--- a/LayoutTests/http/tests/security/cross-origin-cached-images-parallel-expected.txt
+++ b/LayoutTests/http/tests/security/cross-origin-cached-images-parallel-expected.txt
@@ -1,7 +1,3 @@
-CONSOLE MESSAGE: Origin http://localhost:8080 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Cross-origin image load denied by Cross-Origin Resource Sharing policy.
-CONSOLE MESSAGE: Origin http://localhost:8080 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Cross-origin image load denied by Cross-Origin Resource Sharing policy.
Tests source origin difference for cached resources.
Trying to load sequentially the same image from different origins.
diff --git a/LayoutTests/http/tests/security/img-with-failed-cors-check-fails-to-load-expected.txt b/LayoutTests/http/tests/security/img-with-failed-cors-check-fails-to-load-expected.txt
index e429492..2dea142 100644
--- a/LayoutTests/http/tests/security/img-with-failed-cors-check-fails-to-load-expected.txt
+++ b/LayoutTests/http/tests/security/img-with-failed-cors-check-fails-to-load-expected.txt
@@ -1,4 +1,4 @@
CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Cross-origin image load denied by Cross-Origin Resource Sharing policy.
+CONSOLE MESSAGE: Cannot load image http://localhost:8080/security/resources/red200x100.png due to access control checks.
ALERT: PASS: The error event was called.
This test passes if the image below does not load.
diff --git a/LayoutTests/http/tests/security/load-image-after-redirection-2-expected.txt b/LayoutTests/http/tests/security/load-image-after-redirection-2-expected.txt
index 15a80a5..0cbe232 100644
--- a/LayoutTests/http/tests/security/load-image-after-redirection-2-expected.txt
+++ b/LayoutTests/http/tests/security/load-image-after-redirection-2-expected.txt
@@ -1,5 +1,5 @@
CONSOLE MESSAGE: Cross-origin redirection to http://127.0.0.1:8000/security/resources/allow-if-origin.php denied by Cross-Origin Resource Sharing policy: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Cross-origin image load denied by Cross-Origin Resource Sharing policy.
+CONSOLE MESSAGE: Cannot load image http://localhost:8000/resources/redirect.php?url=http://127.0.0.1:8000/security/resources/allow-if-origin.php&allowCache due to access control checks.
PASS Loading an image in no-cors mode after a CORS invalid redirection is ok
diff --git a/LayoutTests/http/tests/security/load-image-after-redirection-expected.txt b/LayoutTests/http/tests/security/load-image-after-redirection-expected.txt
index 17722b4..52654d4 100644
--- a/LayoutTests/http/tests/security/load-image-after-redirection-expected.txt
+++ b/LayoutTests/http/tests/security/load-image-after-redirection-expected.txt
@@ -1,5 +1,5 @@
CONSOLE MESSAGE: Cross-origin redirection to http://127.0.0.1:8000/security/resources/abe-allow-star.php denied by Cross-Origin Resource Sharing policy: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Cross-origin image load denied by Cross-Origin Resource Sharing policy.
+CONSOLE MESSAGE: Cannot load image http://localhost:8000/resources/redirect.php?url=http://127.0.0.1:8000/security/resources/abe-allow-star.php due to access control checks.
PASS Loading an image in no-cors mode after a CORS invalid redirection is ok
diff --git a/LayoutTests/http/tests/security/mixedContent/insecure-xhr-in-main-frame-expected.txt b/LayoutTests/http/tests/security/mixedContent/insecure-xhr-in-main-frame-expected.txt
index c42e555..7abcf74 100644
--- a/LayoutTests/http/tests/security/mixedContent/insecure-xhr-in-main-frame-expected.txt
+++ b/LayoutTests/http/tests/security/mixedContent/insecure-xhr-in-main-frame-expected.txt
@@ -1,4 +1,5 @@
CONSOLE MESSAGE: line 28: [blocked] The page at https://127.0.0.1:8443/security/mixedContent/resources/insecure-xhr-in-main-frame-window.html was not allowed to display insecure content from http://127.0.0.1:8000/.
-CONSOLE MESSAGE: line 28: XMLHttpRequest cannot load http://127.0.0.1:8000/. Not allowed to request resource
+CONSOLE MESSAGE: line 28: Not allowed to request resource
+CONSOLE MESSAGE: line 28: XMLHttpRequest cannot load http://127.0.0.1:8000/ due to access control checks.
This test opens a HTTPS window that loads insecure data via XHR. We should trigger a mixed content callback because the main frame in the window is HTTPS but now has insecure data.
diff --git a/LayoutTests/http/tests/security/video-poster-cross-origin-crash-expected.txt b/LayoutTests/http/tests/security/video-poster-cross-origin-crash-expected.txt
index d4d3cf9..0618480 100644
--- a/LayoutTests/http/tests/security/video-poster-cross-origin-crash-expected.txt
+++ b/LayoutTests/http/tests/security/video-poster-cross-origin-crash-expected.txt
@@ -1,3 +1,3 @@
CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Cross-origin image load denied by Cross-Origin Resource Sharing policy.
+CONSOLE MESSAGE: Cannot load image http://localhost:8080/misc/resources/compass.jpg due to access control checks.
>>>
diff --git a/LayoutTests/http/tests/security/video-poster-cross-origin-crash2-expected.txt b/LayoutTests/http/tests/security/video-poster-cross-origin-crash2-expected.txt
index a94474a..e6032ed 100644
--- a/LayoutTests/http/tests/security/video-poster-cross-origin-crash2-expected.txt
+++ b/LayoutTests/http/tests/security/video-poster-cross-origin-crash2-expected.txt
@@ -1,5 +1,5 @@
CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Cross-origin image load denied by Cross-Origin Resource Sharing policy.
+CONSOLE MESSAGE: Cannot load image http://localhost:8080/nonesuch.png due to access control checks.
Test passes if it doesn't crash.
diff --git a/LayoutTests/http/tests/subresource-integrity/sri-fetch-expected.txt b/LayoutTests/http/tests/subresource-integrity/sri-fetch-expected.txt
index a3eff44..45739d4 100644
--- a/LayoutTests/http/tests/subresource-integrity/sri-fetch-expected.txt
+++ b/LayoutTests/http/tests/subresource-integrity/sri-fetch-expected.txt
@@ -1,14 +1,14 @@
-CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8000/subresource-integrity/resources/resource.txt. Failed integrity metadata check.
-CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8000/subresource-integrity/resources/resource.txt. Failed integrity metadata check.
-CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8000/subresource-integrity/resources/resource.txt. Failed integrity metadata check.
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8000/subresource-integrity/resources/crossorigin-anon-resource.txt. Failed integrity metadata check.
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8000/subresource-integrity/resources/crossorigin-creds-resource.txt. Failed integrity metadata check.
+CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8000/subresource-integrity/resources/resource.txt.
+CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8000/subresource-integrity/resources/resource.txt.
+CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8000/subresource-integrity/resources/resource.txt.
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8000/subresource-integrity/resources/crossorigin-anon-resource.txt.
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8000/subresource-integrity/resources/crossorigin-creds-resource.txt.
CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8000/subresource-integrity/resources/crossorigin-ineligible-resource.txt. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8000/subresource-integrity/resources/crossorigin-ineligible-resource.txt due to access control checks.
CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8000/subresource-integrity/resources/crossorigin-ineligible-resource.txt. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8000/subresource-integrity/resources/crossorigin-ineligible-resource.txt due to access control checks.
CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8000/subresource-integrity/resources/crossorigin-ineligible-resource.txt. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8000/subresource-integrity/resources/crossorigin-ineligible-resource.txt due to access control checks.
PASS Empty string integrity
PASS SHA-256 integrity
diff --git a/LayoutTests/http/tests/workers/service/service-worker-crossorigin-fetch-expected.txt b/LayoutTests/http/tests/workers/service/service-worker-crossorigin-fetch-expected.txt
index 7fe71f3..c7553e0 100644
--- a/LayoutTests/http/tests/workers/service/service-worker-crossorigin-fetch-expected.txt
+++ b/LayoutTests/http/tests/workers/service/service-worker-crossorigin-fetch-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8080/resources/square100.png.fromserviceworker. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8080/resources/square100.png.fromserviceworker due to access control checks.
PASS Testing unintercepted fetch with preflight, fetch should fail
diff --git a/LayoutTests/http/tests/workers/service/shift-reload-navigation-expected.txt b/LayoutTests/http/tests/workers/service/shift-reload-navigation-expected.txt
index 9a7ef73..b7ef867 100644
--- a/LayoutTests/http/tests/workers/service/shift-reload-navigation-expected.txt
+++ b/LayoutTests/http/tests/workers/service/shift-reload-navigation-expected.txt
@@ -1,7 +1,7 @@
CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8080/resources/square100.png.fromserviceworker. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8080/resources/square100.png.fromserviceworker due to access control checks.
CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8080/resources/square100.png.fromserviceworker. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8080/resources/square100.png.fromserviceworker due to access control checks.
PASS: Fetch failed as expected with: TypeError: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
PASS: Got response with buffer byte length being 12940
PASS: Fetch failed as expected with: TypeError: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
diff --git a/LayoutTests/http/tests/xmlhttprequest/access-control-and-redirects-async-expected.txt b/LayoutTests/http/tests/xmlhttprequest/access-control-and-redirects-async-expected.txt
index a722f28..b7fe744 100644
--- a/LayoutTests/http/tests/xmlhttprequest/access-control-and-redirects-async-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/access-control-and-redirects-async-expected.txt
@@ -2,8 +2,10 @@
CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cors.php?url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi due to access control checks.
CONSOLE MESSAGE: Cross-origin redirection to foo://bar.cgi denied by Cross-Origin Resource Sharing policy: URL is either a non-HTTP URL or contains credentials.
CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cors.php?url=foo://bar.cgi&%20%20access-control-allow-origin=http://127.0.0.1:8000 due to access control checks.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cors.php?redirect-preflight=true&%20%20url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi&%20%20access-control-allow-origin=*. Preflight response is not successful
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi. Request header field x-webkit is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cors.php?redirect-preflight=true&%20%20url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi&%20%20access-control-allow-origin=* due to access control checks.
+CONSOLE MESSAGE: Request header field x-webkit is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi due to access control checks.
Tests that asynchronous XMLHttpRequests handle redirects according to the CORS standard.
Testing http://localhost:8000/xmlhttprequest/resources/redirect-cors.php?url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi without credentials
diff --git a/LayoutTests/http/tests/xmlhttprequest/access-control-and-redirects-expected.txt b/LayoutTests/http/tests/xmlhttprequest/access-control-and-redirects-expected.txt
index 8bdff5f..ca37bbd 100644
--- a/LayoutTests/http/tests/xmlhttprequest/access-control-and-redirects-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/access-control-and-redirects-expected.txt
@@ -1,7 +1,9 @@
-CONSOLE MESSAGE: line 25: XMLHttpRequest cannot load http://localhost:8000/resources/redirect.php?url=http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 25: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 25: XMLHttpRequest cannot load http://localhost:8000/resources/redirect.php?url=http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi due to access control checks.
CONSOLE MESSAGE: Cross-origin redirection to http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi denied by Cross-Origin Resource Sharing policy: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/resources/redirect.php?url=http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi due to access control checks.
-CONSOLE MESSAGE: line 25: XMLHttpRequest cannot load http://localhost:8000/resources/redirect.php?url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow.cgi. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 25: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 25: XMLHttpRequest cannot load http://localhost:8000/resources/redirect.php?url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow.cgi due to access control checks.
CONSOLE MESSAGE: Cross-origin redirection to http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow.cgi denied by Cross-Origin Resource Sharing policy: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/resources/redirect.php?url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow.cgi due to access control checks.
Tests that redirects between origins are never allowed, even when access control is involved.
diff --git a/LayoutTests/http/tests/xmlhttprequest/access-control-basic-denied-expected.txt b/LayoutTests/http/tests/xmlhttprequest/access-control-basic-denied-expected.txt
index 65e4878..831eade 100644
--- a/LayoutTests/http/tests/xmlhttprequest/access-control-basic-denied-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/access-control-basic-denied-expected.txt
@@ -1,3 +1,4 @@
-CONSOLE MESSAGE: line 24: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-basic-denied.cgi. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 24: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 24: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-basic-denied.cgi due to access control checks.
PASS: Exception thrown. Cross-domain access was denied in 'send'. [ A network error occurred.].
diff --git a/LayoutTests/http/tests/xmlhttprequest/access-control-basic-denied-preflight-cache-expected.txt b/LayoutTests/http/tests/xmlhttprequest/access-control-basic-denied-preflight-cache-expected.txt
index e9542e8..91040f8 100644
--- a/LayoutTests/http/tests/xmlhttprequest/access-control-basic-denied-preflight-cache-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/access-control-basic-denied-preflight-cache-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-basic-denied.cgi. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-basic-denied.cgi due to access control checks.
Test async xhr preflight cache denial. If this test passes, there should be a single PASS below.
PASS
diff --git a/LayoutTests/http/tests/xmlhttprequest/access-control-basic-get-fail-non-simple-expected.txt b/LayoutTests/http/tests/xmlhttprequest/access-control-basic-get-fail-non-simple-expected.txt
index 5f665f6..e215ca9 100644
--- a/LayoutTests/http/tests/xmlhttprequest/access-control-basic-get-fail-non-simple-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/access-control-basic-get-fail-non-simple-expected.txt
@@ -1,3 +1,4 @@
-CONSOLE MESSAGE: line 28: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-basic-get-fail-non-simple.cgi. Preflight response is not successful
+CONSOLE MESSAGE: line 28: Preflight response is not successful
+CONSOLE MESSAGE: line 28: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-basic-get-fail-non-simple.cgi due to access control checks.
PASS: Exception thrown. Cross-domain access was denied in 'send'. [ A network error occurred.].
diff --git a/LayoutTests/http/tests/xmlhttprequest/access-control-basic-non-simple-deny-cached-expected.txt b/LayoutTests/http/tests/xmlhttprequest/access-control-basic-non-simple-deny-cached-expected.txt
index f8da82c..42b00a9 100644
--- a/LayoutTests/http/tests/xmlhttprequest/access-control-basic-non-simple-deny-cached-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/access-control-basic-non-simple-deny-cached-expected.txt
@@ -1,3 +1,4 @@
-CONSOLE MESSAGE: line 42: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-basic-non-get-allow.cgi. Request header field Content-Type is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: line 42: Request header field Content-Type is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: line 42: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-basic-non-get-allow.cgi due to access control checks.
PASS: Exception thrown. Cross-domain access is not allowed in 'send'. [ A network error occurred.].
diff --git a/LayoutTests/http/tests/xmlhttprequest/access-control-basic-post-fail-non-simple-content-type-expected.txt b/LayoutTests/http/tests/xmlhttprequest/access-control-basic-post-fail-non-simple-content-type-expected.txt
index f76e261..6045366 100644
--- a/LayoutTests/http/tests/xmlhttprequest/access-control-basic-post-fail-non-simple-content-type-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/access-control-basic-post-fail-non-simple-content-type-expected.txt
@@ -1,3 +1,4 @@
-CONSOLE MESSAGE: line 28: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-basic-options-not-supported.cgi. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 28: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 28: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-basic-options-not-supported.cgi due to access control checks.
PASS: Exception thrown. Cross-domain access was denied in 'send'. [ A network error occurred.].
diff --git a/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-header-denied-expected.txt b/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-header-denied-expected.txt
index 3272485..a885aa6 100644
--- a/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-header-denied-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-header-denied-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-async-header-denied&state=header. Request header field X-NON-STANDARD is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: Request header field X-NON-STANDARD is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-async-header-denied&state=header due to access control checks.
PASS: Request successfully blocked.
diff --git a/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-method-denied-expected.txt b/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-method-denied-expected.txt
index ec29498..dcb75a2 100644
--- a/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-method-denied-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-method-denied-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-async-method-denied&state=method. Method DELETE is not allowed by Access-Control-Allow-Methods.
+CONSOLE MESSAGE: Method DELETE is not allowed by Access-Control-Allow-Methods.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-async-method-denied&state=method due to access control checks.
PASS: Request successfully blocked.
diff --git a/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-not-supported-expected.txt b/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-not-supported-expected.txt
index eae9a39..bc9d8a1 100644
--- a/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-not-supported-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-not-supported-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-async-non-supported. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-async-non-supported due to access control checks.
PASS: Request successfully blocked.
diff --git a/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-not-successful-expected.txt b/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-not-successful-expected.txt
index ba9f288..bea282a 100644
--- a/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-not-successful-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-not-successful-expected.txt
@@ -1,7 +1,11 @@
-CONSOLE MESSAGE: line 26: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cors.php?redirect-preflight=true&access-control-allow-headers=x-webkit&access-control-allow-origin=*&url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi. Preflight response is not successful
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cors.php?redirect-preflight=true&access-control-allow-headers=x-webkit&access-control-allow-origin=*&url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi. Preflight response is not successful
-CONSOLE MESSAGE: line 26: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/status-404-without-body.php. Preflight response is not successful
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/status-404-without-body.php. Preflight response is not successful
+CONSOLE MESSAGE: line 26: Preflight response is not successful
+CONSOLE MESSAGE: line 26: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cors.php?redirect-preflight=true&access-control-allow-headers=x-webkit&access-control-allow-origin=*&url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi due to access control checks.
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cors.php?redirect-preflight=true&access-control-allow-headers=x-webkit&access-control-allow-origin=*&url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi due to access control checks.
+CONSOLE MESSAGE: line 26: Preflight response is not successful
+CONSOLE MESSAGE: line 26: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/status-404-without-body.php due to access control checks.
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/status-404-without-body.php due to access control checks.
Tests that not successful preflight responses make preflight failing
Testing http://localhost:8000/xmlhttprequest/resources/redirect-cors.php?redirect-preflight=true&access-control-allow-headers=x-webkit&access-control-allow-origin=*&url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi (sync)
diff --git a/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-header-denied-expected.txt b/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-header-denied-expected.txt
index 7f6698e..ef425d4 100644
--- a/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-header-denied-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-header-denied-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: line 35: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-sync-header-denied&state=header. Request header field X-NON-STANDARD is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: line 35: Request header field X-NON-STANDARD is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: line 35: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-sync-header-denied&state=header due to access control checks.
PASS: Request successfully blocked.
diff --git a/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-method-denied-expected.txt b/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-method-denied-expected.txt
index d6b7099..b045965 100644
--- a/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-method-denied-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-method-denied-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: line 34: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-sync-method-denied&state=method. Method DELETE is not allowed by Access-Control-Allow-Methods.
+CONSOLE MESSAGE: line 34: Method DELETE is not allowed by Access-Control-Allow-Methods.
+CONSOLE MESSAGE: line 34: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-sync-method-denied&state=method due to access control checks.
PASS: Request successfully blocked.
diff --git a/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-not-supported-expected.txt b/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-not-supported-expected.txt
index bdb51e1..7da77f4 100644
--- a/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-not-supported-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-not-supported-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: line 34: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-sync-non-supported. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 34: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 34: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-sync-non-supported due to access control checks.
PASS: Request successfully blocked.
diff --git a/LayoutTests/http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-expected.txt b/LayoutTests/http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-expected.txt
index 113db4d..31d29b1 100644
--- a/LayoutTests/http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: line 17: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-sandboxed-iframe-denied.cgi. Origin null is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 17: Origin null is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 17: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-sandboxed-iframe-denied.cgi due to access control checks.
This test verifies that sandboxed iframe does not have XmlHttpRequest access to its server. It will print "PASS" on success.
diff --git a/LayoutTests/http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-without-wildcard-expected.txt b/LayoutTests/http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-without-wildcard-expected.txt
index f6cad7f..9ba289e 100644
--- a/LayoutTests/http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-without-wildcard-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/access-control-sandboxed-iframe-denied-without-wildcard-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: line 16: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-sandboxed-iframe-denied-without-wildcard.cgi. Origin null is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 16: Origin null is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 16: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-sandboxed-iframe-denied-without-wildcard.cgi due to access control checks.
This test verifies that sandboxed iframe does not have XmlHttpRequest access to its server with "Access-Control-Allow-Origin" set to its own origin (127.0.0.1).
This test will print "PASS" on success.
diff --git a/LayoutTests/http/tests/xmlhttprequest/cors-non-standard-safelisted-headers-should-trigger-preflight-expected.txt b/LayoutTests/http/tests/xmlhttprequest/cors-non-standard-safelisted-headers-should-trigger-preflight-expected.txt
index 3d9efafa..b812632 100644
--- a/LayoutTests/http/tests/xmlhttprequest/cors-non-standard-safelisted-headers-should-trigger-preflight-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/cors-non-standard-safelisted-headers-should-trigger-preflight-expected.txt
@@ -1,21 +1,39 @@
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php. Request header field Accept is not allowed by Access-Control-Allow-Headers.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php. Request header field Accept-Language is not allowed by Access-Control-Allow-Headers.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php. Request header field Content-Language is not allowed by Access-Control-Allow-Headers.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php. Request header field Content-Language is not allowed by Access-Control-Allow-Headers.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php. Request header field Accept is not allowed by Access-Control-Allow-Headers.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php. Request header field Accept is not allowed by Access-Control-Allow-Headers.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php. Request header field Accept is not allowed by Access-Control-Allow-Headers.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php. Request header field Accept is not allowed by Access-Control-Allow-Headers.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php. Request header field Accept is not allowed by Access-Control-Allow-Headers.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php. Request header field Accept is not allowed by Access-Control-Allow-Headers.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php. Request header field Accept is not allowed by Access-Control-Allow-Headers.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php. Request header field Accept is not allowed by Access-Control-Allow-Headers.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php. Request header field Accept is not allowed by Access-Control-Allow-Headers.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php. Request header field Accept is not allowed by Access-Control-Allow-Headers.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php. Request header field Accept is not allowed by Access-Control-Allow-Headers.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php. Request header field Accept is not allowed by Access-Control-Allow-Headers.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php. Request header field Accept is not allowed by Access-Control-Allow-Headers.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php. Request header field Accept is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: Request header field Accept is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php due to access control checks.
+CONSOLE MESSAGE: Request header field Accept-Language is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php due to access control checks.
+CONSOLE MESSAGE: Request header field Content-Language is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php due to access control checks.
+CONSOLE MESSAGE: Request header field Content-Language is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php due to access control checks.
+CONSOLE MESSAGE: Request header field Accept is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php due to access control checks.
+CONSOLE MESSAGE: Request header field Accept is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php due to access control checks.
+CONSOLE MESSAGE: Request header field Accept is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php due to access control checks.
+CONSOLE MESSAGE: Request header field Accept is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php due to access control checks.
+CONSOLE MESSAGE: Request header field Accept is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php due to access control checks.
+CONSOLE MESSAGE: Request header field Accept is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php due to access control checks.
+CONSOLE MESSAGE: Request header field Accept is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php due to access control checks.
+CONSOLE MESSAGE: Request header field Accept is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php due to access control checks.
+CONSOLE MESSAGE: Request header field Accept is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php due to access control checks.
+CONSOLE MESSAGE: Request header field Accept is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php due to access control checks.
+CONSOLE MESSAGE: Request header field Accept is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php due to access control checks.
+CONSOLE MESSAGE: Request header field Accept is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php due to access control checks.
+CONSOLE MESSAGE: Request header field Accept is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php due to access control checks.
+CONSOLE MESSAGE: Request header field Accept is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cors-preflight-safelisted-headers-responder.php due to access control checks.
PASS Accept header value 'application/json,text/*,*/*' SHOULD NOT cause a preflight
PASS Accept header with normal value 'application/vnd.api+json' SHOULD NOT cause a preflight
PASS Accept header with normal value 'text/plain; q=0.5, text/html, text/x-dvi; q=0.8, text/x-c' SHOULD NOT cause a preflight
diff --git a/LayoutTests/http/tests/xmlhttprequest/cross-origin-no-authorization-expected.txt b/LayoutTests/http/tests/xmlhttprequest/cross-origin-no-authorization-expected.txt
index 9f1cd06..e69f619 100644
--- a/LayoutTests/http/tests/xmlhttprequest/cross-origin-no-authorization-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/cross-origin-no-authorization-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: line 56: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cross-origin-no-authorization.php. Credentials flag is true, but Access-Control-Allow-Credentials is not "true".
+CONSOLE MESSAGE: line 56: Credentials flag is true, but Access-Control-Allow-Credentials is not "true".
+CONSOLE MESSAGE: line 56: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cross-origin-no-authorization.php due to access control checks.
CONSOLE MESSAGE: Credentials flag is true, but Access-Control-Allow-Credentials is not "true".
CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cross-origin-no-authorization.php due to access control checks.
Start
diff --git a/LayoutTests/http/tests/xmlhttprequest/cross-site-denied-response-sync-2-expected.txt b/LayoutTests/http/tests/xmlhttprequest/cross-site-denied-response-sync-2-expected.txt
index 6b65f68..9000d9b 100644
--- a/LayoutTests/http/tests/xmlhttprequest/cross-site-denied-response-sync-2-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/cross-site-denied-response-sync-2-expected.txt
@@ -1,3 +1,4 @@
-CONSOLE MESSAGE: line 51: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/reply.xml. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 51: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 51: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/reply.xml due to access control checks.
PASS
diff --git a/LayoutTests/http/tests/xmlhttprequest/cross-site-denied-response-sync-expected.txt b/LayoutTests/http/tests/xmlhttprequest/cross-site-denied-response-sync-expected.txt
index 4a06054..3b61b75 100644
--- a/LayoutTests/http/tests/xmlhttprequest/cross-site-denied-response-sync-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/cross-site-denied-response-sync-expected.txt
@@ -1,3 +1,4 @@
-CONSOLE MESSAGE: line 55: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/reply.xml. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 55: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 55: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/reply.xml due to access control checks.
PASS
diff --git a/LayoutTests/http/tests/xmlhttprequest/origin-exact-matching-expected.txt b/LayoutTests/http/tests/xmlhttprequest/origin-exact-matching-expected.txt
index 4ef6908..b0314f9 100644
--- a/LayoutTests/http/tests/xmlhttprequest/origin-exact-matching-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/origin-exact-matching-expected.txt
@@ -1,48 +1,93 @@
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Fwww2.localhost%3A8000. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=%2F%2Flocalhost%3A8000. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=%3A%2F%2Flocalhost%3A8000. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=ftp%3A%2F%2Flocalhost%3A8000. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%3A%2F%2Flocalhost%3A8000. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2Flocalhost%3A8000. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3Alocalhost%3A8000. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=localhost%3A8000. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%3F. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%2F. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%20%2F. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%23. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%2523. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%3A80. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%00. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=HTTP%3A%2F%2FLOCALHOST%3A8000. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=HTTP%3A%2F%2Flocalhost%3A8000. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=-. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=**. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=%00*. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=*%00. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=%27*%27. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=%22*%22. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=*%20*. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=*http%3A%2F%2F*. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=*http%3A%2F%2Flocalhost%3A8000. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=*%20http%3A%2F%2Flocalhost%3A8000. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=%00http%3A%2F%2Flocalhost%3A8000. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=null%20http%3A%2F%2Flocalhost%3A8000. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Fexample.net. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=null. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%2Fxmlhttprequest%2Fresources%2Forigin-exact-matching-iframe.html. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%2Fxmlhttprequest%2Fresources%2F. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%2Fxmlhttprequest%2Fresources%2Forigin-exact-matching-iframe.html. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%2C%20*. Access-Control-Allow-Origin cannot contain more than one origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%2C*. Access-Control-Allow-Origin cannot contain more than one origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=*%2C%20http%3A%2F%2Flocalhost%3A8000. Access-Control-Allow-Origin cannot contain more than one origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=*%2Chttp%3A%2F%2Flocalhost%3A8000. Access-Control-Allow-Origin cannot contain more than one origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%2Chttp%3A%2F%2Flocalhost%3A8000. Access-Control-Allow-Origin cannot contain more than one origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%2Chttp%3A%2F%2Fexample.net. Access-Control-Allow-Origin cannot contain more than one origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Fexample.net%2Chttp%3A%2F%2Flocalhost%3A8000. Access-Control-Allow-Origin cannot contain more than one origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=%2C. Access-Control-Allow-Origin cannot contain more than one origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=%2Chttp%3A%2F%2Flocalhost%3A8000. Access-Control-Allow-Origin cannot contain more than one origin.
-CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%2C. Access-Control-Allow-Origin cannot contain more than one origin.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Fwww2.localhost%3A8000 due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=%2F%2Flocalhost%3A8000 due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=%3A%2F%2Flocalhost%3A8000 due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=ftp%3A%2F%2Flocalhost%3A8000 due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%3A%2F%2Flocalhost%3A8000 due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2Flocalhost%3A8000 due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3Alocalhost%3A8000 due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=localhost%3A8000 due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%3F due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%2F due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%20%2F due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%23 due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%2523 due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%3A80 due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%00 due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=HTTP%3A%2F%2FLOCALHOST%3A8000 due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=HTTP%3A%2F%2Flocalhost%3A8000 due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=- due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=** due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=%00* due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=*%00 due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=%27*%27 due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=%22*%22 due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=*%20* due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=*http%3A%2F%2F* due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=*http%3A%2F%2Flocalhost%3A8000 due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=*%20http%3A%2F%2Flocalhost%3A8000 due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=%00http%3A%2F%2Flocalhost%3A8000 due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=null%20http%3A%2F%2Flocalhost%3A8000 due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Fexample.net due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=null due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin= due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%2Fxmlhttprequest%2Fresources%2Forigin-exact-matching-iframe.html due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%2Fxmlhttprequest%2Fresources%2F due to access control checks.
+CONSOLE MESSAGE: line 1: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%2Fxmlhttprequest%2Fresources%2Forigin-exact-matching-iframe.html due to access control checks.
+CONSOLE MESSAGE: line 1: Access-Control-Allow-Origin cannot contain more than one origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%2C%20* due to access control checks.
+CONSOLE MESSAGE: line 1: Access-Control-Allow-Origin cannot contain more than one origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%2C* due to access control checks.
+CONSOLE MESSAGE: line 1: Access-Control-Allow-Origin cannot contain more than one origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=*%2C%20http%3A%2F%2Flocalhost%3A8000 due to access control checks.
+CONSOLE MESSAGE: line 1: Access-Control-Allow-Origin cannot contain more than one origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=*%2Chttp%3A%2F%2Flocalhost%3A8000 due to access control checks.
+CONSOLE MESSAGE: line 1: Access-Control-Allow-Origin cannot contain more than one origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%2Chttp%3A%2F%2Flocalhost%3A8000 due to access control checks.
+CONSOLE MESSAGE: line 1: Access-Control-Allow-Origin cannot contain more than one origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%2Chttp%3A%2F%2Fexample.net due to access control checks.
+CONSOLE MESSAGE: line 1: Access-Control-Allow-Origin cannot contain more than one origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Fexample.net%2Chttp%3A%2F%2Flocalhost%3A8000 due to access control checks.
+CONSOLE MESSAGE: line 1: Access-Control-Allow-Origin cannot contain more than one origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=%2C due to access control checks.
+CONSOLE MESSAGE: line 1: Access-Control-Allow-Origin cannot contain more than one origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=%2Chttp%3A%2F%2Flocalhost%3A8000 due to access control checks.
+CONSOLE MESSAGE: line 1: Access-Control-Allow-Origin cannot contain more than one origin.
+CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-allow-lists.php?origin=http%3A%2F%2Flocalhost%3A8000%2C due to access control checks.
--------
diff --git a/LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-https-expected.txt b/LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-https-expected.txt
index e6ae1d2..b7b64c6 100644
--- a/LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-https-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-https-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: line 20: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/get.txt. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 20: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 20: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/get.txt due to access control checks.
CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/get.txt due to access control checks.
Tests that origin whitelisting for https does not match http URLs.
diff --git a/LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-ip-addresses-with-subdomains-expected.txt b/LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-ip-addresses-with-subdomains-expected.txt
index 66c2e6b..21b3ad0e 100644
--- a/LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-ip-addresses-with-subdomains-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-ip-addresses-with-subdomains-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: line 16: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/get.txt. Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 16: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 16: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/get.txt due to access control checks.
CONSOLE MESSAGE: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/get.txt due to access control checks.
Specifying that an IP address should match subdomains doesn't make sense. This test verifies that it doesn't do anything.
diff --git a/LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-removal-expected.txt b/LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-removal-expected.txt
index 29f4b38..05e0f62 100644
--- a/LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-removal-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-removal-expected.txt
@@ -1,11 +1,19 @@
-CONSOLE MESSAGE: line 19: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/get.txt. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 19: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/get.txt. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 19: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/get.txt. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 19: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/get.txt. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 19: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/get.txt. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 19: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/get.txt. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 19: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/get.txt. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 19: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/get.txt. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 19: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 19: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/get.txt due to access control checks.
+CONSOLE MESSAGE: line 19: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 19: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/get.txt due to access control checks.
+CONSOLE MESSAGE: line 19: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 19: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/get.txt due to access control checks.
+CONSOLE MESSAGE: line 19: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 19: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/get.txt due to access control checks.
+CONSOLE MESSAGE: line 19: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 19: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/get.txt due to access control checks.
+CONSOLE MESSAGE: line 19: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 19: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/get.txt due to access control checks.
+CONSOLE MESSAGE: line 19: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 19: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/get.txt due to access control checks.
+CONSOLE MESSAGE: line 19: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 19: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/get.txt due to access control checks.
Tests the behavior of whitelisting origins and removing them later.
Testing: source origin: http://127.0.0.1:8000 destination origin: http:localhost
diff --git a/LayoutTests/http/tests/xmlhttprequest/post-blob-content-type-sync-expected.txt b/LayoutTests/http/tests/xmlhttprequest/post-blob-content-type-sync-expected.txt
index cc472e5..b0aeed9 100644
--- a/LayoutTests/http/tests/xmlhttprequest/post-blob-content-type-sync-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/post-blob-content-type-sync-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: line 44: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-allow-lists.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 44: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 44: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-allow-lists.php due to access control checks.
Test verifies that content MIME type is set correctly when Blob is sent using XMLHttpRequest synchronously.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
diff --git a/LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-post-expected.txt b/LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-post-expected.txt
index e74e9f6..86bb8e1 100644
--- a/LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-post-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-post-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/reply.xml. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/reply.xml due to access control checks.
CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:7/ due to access control checks.
Test that a cross-origin redirect to a server that responds is indistinguishable from one that does not. Should say PASS:
diff --git a/LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-post-sync-expected.txt b/LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-post-sync-expected.txt
index 3899e26..9fab1a5 100644
--- a/LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-post-sync-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-post-sync-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: line 31: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/reply.xml. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 31: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 31: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/reply.xml due to access control checks.
Test that a cross-origin redirect to a server that responds is indistinguishable from one that does not. Should say PASS:
PASS
diff --git a/LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-sync-expected.txt b/LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-sync-expected.txt
index 83841bf..840531b 100644
--- a/LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-sync-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-sync-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: line 26: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/reply.xml. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 26: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 26: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/reply.xml due to access control checks.
Test that a cross-origin redirect to a server that responds is indistinguishable from one that does not. Should say PASS:
PASS
diff --git a/LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-tripmine-expected.txt b/LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-tripmine-expected.txt
index cda3f94..c05094f 100644
--- a/LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-tripmine-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-tripmine-expected.txt
@@ -1,23 +1,43 @@
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 62: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 62: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 62: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 62: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 62: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 62: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 62: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 62: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 62: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 62: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: line 62: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 62: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: line 62: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 62: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: line 62: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 62: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: line 62: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 62: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: line 62: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 62: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: line 62: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 62: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: line 62: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 62: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: line 62: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 62: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: line 62: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 62: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: line 62: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 62: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
Test that a cross-origin redirect does not result in a non-simple request being sent to the target.
Asynchronous XMLHttpRequest 307 POST redirect:
diff --git a/LayoutTests/http/tests/xmlhttprequest/simple-cross-origin-denied-events-post-expected.txt b/LayoutTests/http/tests/xmlhttprequest/simple-cross-origin-denied-events-post-expected.txt
index f8db242..7192144 100644
--- a/LayoutTests/http/tests/xmlhttprequest/simple-cross-origin-denied-events-post-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/simple-cross-origin-denied-events-post-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/reply.xml. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/reply.xml due to access control checks.
CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:7/ due to access control checks.
Test that a simple cross-origin request to a server that responds (but does not permit cross-origin requests) is indistinguishable from one that does not exist. Should say PASS:
diff --git a/LayoutTests/http/tests/xmlhttprequest/simple-cross-origin-denied-events-post-sync-expected.txt b/LayoutTests/http/tests/xmlhttprequest/simple-cross-origin-denied-events-post-sync-expected.txt
index 28cc6fa..41eb844 100644
--- a/LayoutTests/http/tests/xmlhttprequest/simple-cross-origin-denied-events-post-sync-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/simple-cross-origin-denied-events-post-sync-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: line 32: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/reply.xml. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 32: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 32: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/reply.xml due to access control checks.
Test that a simple cross-origin request to a server that responds (but does not permit cross-origin requests) is indistinguishable from one that does not exist. Should say PASS:
PASS
diff --git a/LayoutTests/http/tests/xmlhttprequest/simple-cross-origin-denied-events-sync-expected.txt b/LayoutTests/http/tests/xmlhttprequest/simple-cross-origin-denied-events-sync-expected.txt
index 024fac1..54c80bf 100644
--- a/LayoutTests/http/tests/xmlhttprequest/simple-cross-origin-denied-events-sync-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/simple-cross-origin-denied-events-sync-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: line 26: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/reply.xml. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 26: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 26: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/reply.xml due to access control checks.
Test that a simple cross-origin request to a server that responds (but does not permit cross-origin requests) is indistinguishable from one that does not exist. Should say PASS:
PASS
diff --git a/LayoutTests/http/tests/xmlhttprequest/simple-cross-origin-progress-events-expected.txt b/LayoutTests/http/tests/xmlhttprequest/simple-cross-origin-progress-events-expected.txt
index ab4a627..0a1c7f89 100644
--- a/LayoutTests/http/tests/xmlhttprequest/simple-cross-origin-progress-events-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/simple-cross-origin-progress-events-expected.txt
@@ -1,6 +1,7 @@
CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cross-site-progress-events.cgi due to access control checks.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cross-site-progress-events.cgi. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cross-site-progress-events.cgi due to access control checks.
Test that upload progress events are not dispatched for simple cross-origin requests (i.e. if the listener is set after calling send(), and there are no other reasons to make a preflight request).
Test 1: The URL is allowed for cross-origin requests
diff --git a/LayoutTests/http/tests/xmlhttprequest/upload-request-error-event-order-expected.txt b/LayoutTests/http/tests/xmlhttprequest/upload-request-error-event-order-expected.txt
index 146701a..556c6e7 100644
--- a/LayoutTests/http/tests/xmlhttprequest/upload-request-error-event-order-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/upload-request-error-event-order-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cross-site-progress-events.cgi. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cross-site-progress-events.cgi due to access control checks.
Test to validate the order in which the events are fired in case of a request error.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
diff --git a/LayoutTests/http/tests/xmlhttprequest/workers/access-control-basic-get-fail-non-simple-expected.txt b/LayoutTests/http/tests/xmlhttprequest/workers/access-control-basic-get-fail-non-simple-expected.txt
index 11ec36a..ff9c840 100644
--- a/LayoutTests/http/tests/xmlhttprequest/workers/access-control-basic-get-fail-non-simple-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/workers/access-control-basic-get-fail-non-simple-expected.txt
@@ -1,3 +1,4 @@
+CONSOLE MESSAGE: Preflight response is not successful
GET should not trigger a preflight request from a worker unless it has non-simple headers.
PASS: Cross-domain access allowed for simple get.
diff --git a/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-sync-no-progress-events-expected.txt b/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-sync-no-progress-events-expected.txt
index 821e9402..9ac5e7c 100644
--- a/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-sync-no-progress-events-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-sync-no-progress-events-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: line 35: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/xmlhttprequest-sync-vs-async-assertion-failure.html. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 35: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 35: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/xmlhttprequest-sync-vs-async-assertion-failure.html due to access control checks.
Test for:
bug 40996: Progress event should not be fired during synchronous XMLHttpRequest;
diff --git a/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-unsafe-redirect-expected.txt b/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-unsafe-redirect-expected.txt
index 4966971..409191a 100644
--- a/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-unsafe-redirect-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-unsafe-redirect-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: line 54: XMLHttpRequest cannot load http://localhost:8080/xmlhttprequest/resources/forbidden.txt. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 54: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 54: XMLHttpRequest cannot load http://localhost:8080/xmlhttprequest/resources/forbidden.txt due to access control checks.
CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8080/xmlhttprequest/resources/forbidden.txt due to access control checks.
This tests that unsafe redirects won't be allowed when making an XMLHttpRequest.
diff --git a/LayoutTests/http/wpt/resource-timing/rt-resource-errors-expected.txt b/LayoutTests/http/wpt/resource-timing/rt-resource-errors-expected.txt
index a0aff72..62f7a41 100644
--- a/LayoutTests/http/wpt/resource-timing/rt-resource-errors-expected.txt
+++ b/LayoutTests/http/wpt/resource-timing/rt-resource-errors-expected.txt
@@ -1,6 +1,6 @@
CONSOLE MESSAGE: Refused to load http://localhost:8801/WebKit/resource-timing/resources/resource.png?csp-denied because it does not appear in the img-src directive of the Content Security Policy.
CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8801/WebKit/resource-timing/resources/data.json?cors-denied. Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8801/WebKit/resource-timing/resources/data.json?cors-denied due to access control checks.
Resource Timing: Error cases
diff --git a/LayoutTests/imported/w3c/ChangeLog b/LayoutTests/imported/w3c/ChangeLog
index 5f1a4cd..cbd9dea 100644
--- a/LayoutTests/imported/w3c/ChangeLog
+++ b/LayoutTests/imported/w3c/ChangeLog
@@ -1,3 +1,43 @@
+2018-04-25 Youenn Fablet <youenn@apple.com>
+
+ Make DocumentThreadableLoader error logging more consistent
+ https://bugs.webkit.org/show_bug.cgi?id=184853
+
+ Reviewed by Chris Dumez.
+
+ * web-platform-tests/XMLHttpRequest/access-control-basic-cors-safelisted-request-headers-expected.txt:
+ * web-platform-tests/XMLHttpRequest/access-control-basic-denied-expected.txt:
+ * web-platform-tests/XMLHttpRequest/access-control-basic-get-fail-non-simple-expected.txt:
+ * web-platform-tests/XMLHttpRequest/access-control-basic-non-cors-safelisted-content-type-expected.txt:
+ * web-platform-tests/XMLHttpRequest/access-control-basic-post-with-non-cors-safelisted-content-type-expected.txt:
+ * web-platform-tests/XMLHttpRequest/access-control-basic-preflight-denied-expected.txt:
+ * web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-301-expected.txt:
+ * web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-400-expected.txt:
+ * web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-501-expected.txt:
+ * web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-denied-expected.txt:
+ * web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-denied-without-wildcard-expected.txt:
+ * web-platform-tests/XMLHttpRequest/send-non-same-origin-expected.txt:
+ * web-platform-tests/XMLHttpRequest/send-non-same-origin.sub-expected.txt:
+ * web-platform-tests/fetch/api/basic/mode-same-origin.any-expected.txt:
+ * web-platform-tests/fetch/api/basic/scheme-about.any-expected.txt:
+ * web-platform-tests/fetch/api/basic/scheme-about.any.worker-expected.txt:
+ * web-platform-tests/fetch/api/basic/scheme-blob-expected.txt:
+ * web-platform-tests/fetch/api/basic/scheme-others-expected.txt:
+ * web-platform-tests/fetch/api/cors/cors-basic.any-expected.txt:
+ * web-platform-tests/fetch/api/cors/cors-multiple-origins-expected.txt:
+ * web-platform-tests/fetch/api/cors/cors-origin.any.worker-expected.txt:
+ * web-platform-tests/fetch/api/cors/cors-preflight-redirect.any.worker-expected.txt:
+ * web-platform-tests/fetch/api/cors/cors-preflight-star.any-expected.txt:
+ * web-platform-tests/fetch/api/cors/cors-preflight-star.any.worker-expected.txt:
+ * web-platform-tests/fetch/api/cors/cors-preflight-status.any.worker-expected.txt:
+ * web-platform-tests/fetch/api/cors/cors-preflight.any.worker-expected.txt:
+ * web-platform-tests/fetch/api/cors/cors-redirect-preflight.any.worker-expected.txt:
+ * web-platform-tests/fetch/api/redirect/redirect-schemes-expected.txt:
+ * web-platform-tests/fetch/api/redirect/redirect-to-dataurl-expected.txt:
+ * web-platform-tests/fetch/api/request/request-keepalive-quota-expected.txt:
+ * web-platform-tests/service-workers/service-worker/fetch-event-redirect.https-expected.txt:
+ * web-platform-tests/service-workers/service-worker/fetch-request-fallback.https-expected.txt:
+
2018-04-25 Ms2ger <Ms2ger@igalia.com>
imported/w3c/web-platform-tests/2dcontext/imagebitmap/createImageBitmap-* LayoutTests are flaky failures
diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-cors-safelisted-request-headers-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-cors-safelisted-request-headers-expected.txt
index ec0a083..75eefb5 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-cors-safelisted-request-headers-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-cors-safelisted-request-headers-expected.txt
@@ -1,4 +1,3 @@
-CONSOLE MESSAGE: line 22: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-basic-cors-safelisted-request-headers.py. Preflight response is not successful
FAIL Request with CORS-safelisted headers A network error occurred.
diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-denied-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-denied-expected.txt
index 78040e0..c4d1413 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-denied-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-denied-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: line 26: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-basic-denied.py. Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 26: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 26: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-basic-denied.py due to access control checks.
PASS Same-origin request accepted
PASS Cross-origin request denied
diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-get-fail-non-simple-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-get-fail-non-simple-expected.txt
index 35f2b53..e0c8ccb 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-get-fail-non-simple-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-get-fail-non-simple-expected.txt
@@ -1,4 +1,3 @@
-CONSOLE MESSAGE: line 22: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-basic-options-not-supported.py. Preflight response is not successful
PASS Preflighted cross-origin request denied
diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-non-cors-safelisted-content-type-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-non-cors-safelisted-content-type-expected.txt
index 48afa24..bb2408d 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-non-cors-safelisted-content-type-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-non-cors-safelisted-content-type-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: line 26: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-basic-put-allow.py. Request header field Content-Type is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: line 26: Request header field Content-Type is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: line 26: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-basic-put-allow.py due to access control checks.
PASS Deny cross-origin request with non-CORS-safelisted content type
diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-post-with-non-cors-safelisted-content-type-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-post-with-non-cors-safelisted-content-type-expected.txt
index f31e312..678c53a 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-post-with-non-cors-safelisted-content-type-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-post-with-non-cors-safelisted-content-type-expected.txt
@@ -1,4 +1,3 @@
-CONSOLE MESSAGE: line 33: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-basic-options-not-supported.py. Preflight response is not successful
PASS Same-origin request with non-safelisted content type succeeds
PASS CORS request with non-safelisted content type sends preflight and fails
diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-preflight-denied-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-preflight-denied-expected.txt
index 1b3edfc..155457e 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-preflight-denied-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-basic-preflight-denied-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-basic-denied.py. Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-basic-denied.py due to access control checks.
PASS Tests async XHR preflight denial due to lack of CORS headers
diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-301-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-301-expected.txt
index 34cd7a6..784532b 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-301-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-301-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-preflight-request-invalid-status.py?code=301. Preflight response is not successful
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-preflight-request-invalid-status.py?code=301 due to access control checks.
PASS Request with 301 preflight response
diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-400-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-400-expected.txt
index bd07743..95c44a2 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-400-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-400-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-preflight-request-invalid-status.py?code=400. Preflight response is not successful
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-preflight-request-invalid-status.py?code=400 due to access control checks.
PASS Request with 400 preflight response
diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-501-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-501-expected.txt
index 7db466e..806e9c7 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-501-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-preflight-request-invalid-status-501-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-preflight-request-invalid-status.py?code=501. Preflight response is not successful
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-preflight-request-invalid-status.py?code=501 due to access control checks.
PASS Request with 501 preflight response
diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-denied-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-denied-expected.txt
index b9bd42b..da45366 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-denied-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-denied-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: line 12: XMLHttpRequest cannot load http://localhost:8800/XMLHttpRequest/resources/pass.txt?pipe=header(Cache-Control,no-store)|header(Content-Type,text/plain). Origin null is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 12: Origin null is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 12: XMLHttpRequest cannot load http://localhost:8800/XMLHttpRequest/resources/pass.txt?pipe=header(Cache-Control,no-store)|header(Content-Type,text/plain) due to access control checks.
PASS Check that path exists and is accessible via local XHR request
diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-denied-without-wildcard-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-denied-without-wildcard-expected.txt
index bea9710..2da47a4 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-denied-without-wildcard-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-sandboxed-iframe-denied-without-wildcard-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: line 12: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/pass.txt?pipe=header(Cache-Control,no-store)|header(Content-Type,text/plain)header(Access-Control-Allow-Credentials,true)|header(Access-Control-Allow-Origin,http://localhost:8800). Origin null is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 12: Origin null is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 12: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/pass.txt?pipe=header(Cache-Control,no-store)|header(Content-Type,text/plain)header(Access-Control-Allow-Credentials,true)|header(Access-Control-Allow-Origin,http://localhost:8800) due to access control checks.
PASS Check that path exists and is accessible via CORS XHR request
diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-non-same-origin-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-non-same-origin-expected.txt
index b77e302..155f5a4 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-non-same-origin-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-non-same-origin-expected.txt
@@ -1,10 +1,17 @@
-CONSOLE MESSAGE: line 21: XMLHttpRequest cannot load mailto:test@example.org. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: line 21: XMLHttpRequest cannot load tel:+31600000000. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: line 21: XMLHttpRequest cannot load http://127.0.0.1:8800/. Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 21: XMLHttpRequest cannot load javascript:alert('FAIL'). Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: line 21: XMLHttpRequest cannot load http://127.0.0.1:8800/folder.txt. Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 21: XMLHttpRequest cannot load about:blank. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: line 21: XMLHttpRequest cannot load blob:bogusidentifier. Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 21: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 21: XMLHttpRequest cannot load mailto:test@example.org due to access control checks.
+CONSOLE MESSAGE: line 21: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 21: XMLHttpRequest cannot load tel:+31600000000 due to access control checks.
+CONSOLE MESSAGE: line 21: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 21: XMLHttpRequest cannot load http://127.0.0.1:8800/ due to access control checks.
+CONSOLE MESSAGE: line 21: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 21: XMLHttpRequest cannot load javascript:alert('FAIL') due to access control checks.
+CONSOLE MESSAGE: line 21: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 21: XMLHttpRequest cannot load http://127.0.0.1:8800/folder.txt due to access control checks.
+CONSOLE MESSAGE: line 21: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 21: XMLHttpRequest cannot load about:blank due to access control checks.
+CONSOLE MESSAGE: line 21: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 21: XMLHttpRequest cannot load blob:bogusidentifier due to access control checks.
PASS XMLHttpRequest: send() - non same-origin (mailto:test@example.org)
PASS XMLHttpRequest: send() - non same-origin (tel:+31600000000)
diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-non-same-origin.sub-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-non-same-origin.sub-expected.txt
index c3e2a8a..ee88c85 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-non-same-origin.sub-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/send-non-same-origin.sub-expected.txt
@@ -1,8 +1,13 @@
-CONSOLE MESSAGE: line 23: XMLHttpRequest cannot load mailto:test@example.org. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: line 23: XMLHttpRequest cannot load tel:+31600000000. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: line 23: XMLHttpRequest cannot load http://127.0.0.1:8800/. Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: line 23: XMLHttpRequest cannot load javascript:alert('FAIL'). Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: line 23: XMLHttpRequest cannot load http://127.0.0.1:8800/folder.txt. Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 23: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 23: XMLHttpRequest cannot load mailto:test@example.org due to access control checks.
+CONSOLE MESSAGE: line 23: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 23: XMLHttpRequest cannot load tel:+31600000000 due to access control checks.
+CONSOLE MESSAGE: line 23: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 23: XMLHttpRequest cannot load http://127.0.0.1:8800/ due to access control checks.
+CONSOLE MESSAGE: line 23: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 23: XMLHttpRequest cannot load javascript:alert('FAIL') due to access control checks.
+CONSOLE MESSAGE: line 23: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: line 23: XMLHttpRequest cannot load http://127.0.0.1:8800/folder.txt due to access control checks.
PASS XMLHttpRequest: send() - non same-origin (mailto:test@example.org)
PASS XMLHttpRequest: send() - non same-origin (tel:+31600000000)
diff --git a/LayoutTests/imported/w3c/web-platform-tests/eventsource/eventsource-constructor-non-same-origin-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/eventsource/eventsource-constructor-non-same-origin-expected.txt
index 857951e..69cbd3b 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/eventsource/eventsource-constructor-non-same-origin-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/eventsource/eventsource-constructor-non-same-origin-expected.txt
@@ -1,7 +1,11 @@
-CONSOLE MESSAGE: EventSource cannot load ftp://example.not/. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: EventSource cannot load about:blank. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: EventSource cannot load mailto:whatwg@awesome.example. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: EventSource cannot load javascript:alert('FAIL'). Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: EventSource cannot load ftp://example.not/ due to access control checks.
+CONSOLE MESSAGE: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: EventSource cannot load about:blank due to access control checks.
+CONSOLE MESSAGE: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: EventSource cannot load mailto:whatwg@awesome.example due to access control checks.
+CONSOLE MESSAGE: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: EventSource cannot load javascript:alert('FAIL') due to access control checks.
PASS EventSource: constructor (act as if there is a network error) (ftp://example.not/)
PASS EventSource: constructor (act as if there is a network error) (about:blank)
diff --git a/LayoutTests/imported/w3c/web-platform-tests/eventsource/eventsource-cross-origin-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/eventsource/eventsource-cross-origin-expected.txt
index e1fc4e2..00f7fc3 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/eventsource/eventsource-cross-origin-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/eventsource/eventsource-cross-origin-expected.txt
@@ -1,15 +1,15 @@
Blocked access to external URL http://xn--lve-6lad.localhost:8800/eventsource/resources/cors.py?run=message
-CONSOLE MESSAGE: EventSource cannot load http://xn--lve-6lad.localhost:8800/eventsource/resources/cors.py?run=message.
+CONSOLE MESSAGE: EventSource cannot load http://xn--lve-6lad.localhost:8800/eventsource/resources/cors.py?run=message due to access control checks.
Blocked access to external URL http://xn--lve-6lad.localhost:8800/eventsource/resources/cors.py?run=redirect&location=/eventsource/resources/cors.py?run=message
-CONSOLE MESSAGE: EventSource cannot load http://xn--lve-6lad.localhost:8800/eventsource/resources/cors.py?run=redirect&location=/eventsource/resources/cors.py?run=message.
+CONSOLE MESSAGE: EventSource cannot load http://xn--lve-6lad.localhost:8800/eventsource/resources/cors.py?run=redirect&location=/eventsource/resources/cors.py?run=message due to access control checks.
Blocked access to external URL http://xn--lve-6lad.localhost:8800/eventsource/resources/cors.py?run=status-reconnect&status=200
-CONSOLE MESSAGE: EventSource cannot load http://xn--lve-6lad.localhost:8800/eventsource/resources/cors.py?run=status-reconnect&status=200.
+CONSOLE MESSAGE: EventSource cannot load http://xn--lve-6lad.localhost:8800/eventsource/resources/cors.py?run=status-reconnect&status=200 due to access control checks.
Blocked access to external URL http://xn--lve-6lad.localhost:8800/eventsource/resources/cors.py?run=message&origin=http://example.org
-CONSOLE MESSAGE: EventSource cannot load http://xn--lve-6lad.localhost:8800/eventsource/resources/cors.py?run=message&origin=http://example.org.
+CONSOLE MESSAGE: EventSource cannot load http://xn--lve-6lad.localhost:8800/eventsource/resources/cors.py?run=message&origin=http://example.org due to access control checks.
Blocked access to external URL http://xn--lve-6lad.localhost:8800/eventsource/resources/cors.py?run=message&origin=
-CONSOLE MESSAGE: EventSource cannot load http://xn--lve-6lad.localhost:8800/eventsource/resources/cors.py?run=message&origin=.
+CONSOLE MESSAGE: EventSource cannot load http://xn--lve-6lad.localhost:8800/eventsource/resources/cors.py?run=message&origin= due to access control checks.
Blocked access to external URL http://xn--lve-6lad.localhost:8800/eventsource/resources/message.py
-CONSOLE MESSAGE: EventSource cannot load http://xn--lve-6lad.localhost:8800/eventsource/resources/message.py.
+CONSOLE MESSAGE: EventSource cannot load http://xn--lve-6lad.localhost:8800/eventsource/resources/message.py due to access control checks.
Harness Error (TIMEOUT), message = null
diff --git a/LayoutTests/imported/w3c/web-platform-tests/eventsource/interfaces-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/eventsource/interfaces-expected.txt
index 08429b2..350f21f 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/eventsource/interfaces-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/eventsource/interfaces-expected.txt
@@ -1,6 +1,6 @@
CONSOLE MESSAGE: line 331: callback not yet supported
Blocked access to external URL http://foo/
-CONSOLE MESSAGE: EventSource cannot load http://foo/.
+CONSOLE MESSAGE: EventSource cannot load http://foo/ due to access control checks.
EventSource IDL tests
diff --git a/LayoutTests/imported/w3c/web-platform-tests/eventsource/request-cache-control-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/eventsource/request-cache-control-expected.txt
index 8d006ff..73f5676 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/eventsource/request-cache-control-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/eventsource/request-cache-control-expected.txt
@@ -1,5 +1,5 @@
Blocked access to external URL http://www2.localhost:8800/eventsource/resources/cors.py?run=cache-control
-CONSOLE MESSAGE: EventSource cannot load http://www2.localhost:8800/eventsource/resources/cors.py?run=cache-control.
+CONSOLE MESSAGE: EventSource cannot load http://www2.localhost:8800/eventsource/resources/cors.py?run=cache-control due to access control checks.
Harness Error (TIMEOUT), message = null
diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin.any-expected.txt
index 289605c..453b9fa 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin.any-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/mode-same-origin.any-expected.txt
@@ -1,5 +1,5 @@
-CONSOLE MESSAGE: line 12: Fetch API cannot load https://localhost:9443/fetch/api/resources/top.txt. Cross origin requests are not allowed when using same-origin fetch mode.
-CONSOLE MESSAGE: line 12: Fetch API cannot load http://127.0.0.1:8800/fetch/api/resources/top.txt. Cross origin requests are not allowed when using same-origin fetch mode.
+CONSOLE MESSAGE: line 12: Fetch API cannot load https://localhost:9443/fetch/api/resources/top.txt.
+CONSOLE MESSAGE: line 12: Fetch API cannot load http://127.0.0.1:8800/fetch/api/resources/top.txt.
CONSOLE MESSAGE: Unsafe attempt to load URL https://localhost:9443/fetch/api/resources/top.txt?location=https%3A%2F%2Flocalhost%3A9443%2Ffetch%2Fapi%2Fresources%2Ftop.txt&count=1 from frame with URL http://localhost:8800/fetch/api/basic/mode-same-origin.any.html. Domains, protocols and ports must match.
CONSOLE MESSAGE: Unsafe attempt to load URL http://127.0.0.1:8800/fetch/api/resources/top.txt?location=http%3A%2F%2F127.0.0.1%3A8800%2Ffetch%2Fapi%2Fresources%2Ftop.txt&count=1 from frame with URL http://localhost:8800/fetch/api/basic/mode-same-origin.any.html. Domains, protocols and ports must match.
diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-about.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-about.any-expected.txt
index c12cfa7..0b36df4 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-about.any-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-about.any-expected.txt
@@ -1,9 +1,15 @@
-CONSOLE MESSAGE: line 10: Fetch API cannot load about:blank. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: Fetch API cannot load about:blank. Preflight response is not successful
-CONSOLE MESSAGE: line 10: Fetch API cannot load about:blank. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: line 27: Fetch API cannot load about:invalid.com. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: line 27: Fetch API cannot load about:config. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: line 27: Fetch API cannot load about:unicorn. Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 10: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 10: Fetch API cannot load about:blank due to access control checks.
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: Fetch API cannot load about:blank due to access control checks.
+CONSOLE MESSAGE: line 10: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 10: Fetch API cannot load about:blank due to access control checks.
+CONSOLE MESSAGE: line 27: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 27: Fetch API cannot load about:invalid.com due to access control checks.
+CONSOLE MESSAGE: line 27: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 27: Fetch API cannot load about:config due to access control checks.
+CONSOLE MESSAGE: line 27: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 27: Fetch API cannot load about:unicorn due to access control checks.
FAIL Fetching about:blank (GET) is OK promise_test: Unhandled rejection with value: object "TypeError: Cross origin requests are only supported for HTTP."
FAIL Fetching about:blank (PUT) is OK promise_test: Unhandled rejection with value: object "TypeError: Preflight response is not successful"
diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-about.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-about.any.worker-expected.txt
index 6304a83..45cb150 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-about.any.worker-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-about.any.worker-expected.txt
@@ -1,3 +1,4 @@
+CONSOLE MESSAGE: Preflight response is not successful
FAIL Fetching about:blank (GET) is OK promise_test: Unhandled rejection with value: object "TypeError: Cross origin requests are only supported for HTTP."
FAIL Fetching about:blank (PUT) is OK promise_test: Unhandled rejection with value: object "TypeError: Preflight response is not successful"
diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-expected.txt
index c9f880c..d91402f 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-blob-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: line 27: Fetch API cannot load blob:http://www.localhost:8800/. Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 27: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 27: Fetch API cannot load blob:http://www.localhost:8800/ due to access control checks.
PASS Fetching [GET] URL.createObjectURL(blob) is OK
PASS Fetching [GET] blob:http://www.localhost:8800/ is KO
diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-others-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-others-expected.txt
index ed68ec6..38aebb9 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-others-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/scheme-others-expected.txt
@@ -1,19 +1,35 @@
-CONSOLE MESSAGE: line 10: Fetch API cannot load aaa://localhost:8800/. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: line 10: Fetch API cannot load cap://localhost:8800/. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: line 10: Fetch API cannot load cid://localhost:8800/. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: line 10: Fetch API cannot load dav://localhost:8800/. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: line 10: Fetch API cannot load dict://localhost:8800/. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: line 10: Fetch API cannot load dns://localhost:8800/. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: line 10: Fetch API cannot load geo://localhost:8800/. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: line 10: Fetch API cannot load im://localhost:8800/. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: line 10: Fetch API cannot load imap://localhost:8800/. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: line 10: Fetch API cannot load ipp://localhost:8800/. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: line 10: Fetch API cannot load ldap://localhost:8800/. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: line 10: Fetch API cannot load mailto://localhost:8800/. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: line 10: Fetch API cannot load nfs://localhost:8800/. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: line 10: Fetch API cannot load pop://localhost:8800/. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: line 10: Fetch API cannot load rtsp://localhost:8800/. Cross origin requests are only supported for HTTP.
-CONSOLE MESSAGE: line 10: Fetch API cannot load snmp://localhost:8800/. Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 10: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 10: Fetch API cannot load aaa://localhost:8800/ due to access control checks.
+CONSOLE MESSAGE: line 10: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 10: Fetch API cannot load cap://localhost:8800/ due to access control checks.
+CONSOLE MESSAGE: line 10: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 10: Fetch API cannot load cid://localhost:8800/ due to access control checks.
+CONSOLE MESSAGE: line 10: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 10: Fetch API cannot load dav://localhost:8800/ due to access control checks.
+CONSOLE MESSAGE: line 10: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 10: Fetch API cannot load dict://localhost:8800/ due to access control checks.
+CONSOLE MESSAGE: line 10: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 10: Fetch API cannot load dns://localhost:8800/ due to access control checks.
+CONSOLE MESSAGE: line 10: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 10: Fetch API cannot load geo://localhost:8800/ due to access control checks.
+CONSOLE MESSAGE: line 10: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 10: Fetch API cannot load im://localhost:8800/ due to access control checks.
+CONSOLE MESSAGE: line 10: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 10: Fetch API cannot load imap://localhost:8800/ due to access control checks.
+CONSOLE MESSAGE: line 10: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 10: Fetch API cannot load ipp://localhost:8800/ due to access control checks.
+CONSOLE MESSAGE: line 10: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 10: Fetch API cannot load ldap://localhost:8800/ due to access control checks.
+CONSOLE MESSAGE: line 10: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 10: Fetch API cannot load mailto://localhost:8800/ due to access control checks.
+CONSOLE MESSAGE: line 10: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 10: Fetch API cannot load nfs://localhost:8800/ due to access control checks.
+CONSOLE MESSAGE: line 10: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 10: Fetch API cannot load pop://localhost:8800/ due to access control checks.
+CONSOLE MESSAGE: line 10: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 10: Fetch API cannot load rtsp://localhost:8800/ due to access control checks.
+CONSOLE MESSAGE: line 10: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 10: Fetch API cannot load snmp://localhost:8800/ due to access control checks.
PASS Fetching aaa://localhost:8800/ is KO
PASS Fetching cap://localhost:8800/ is KO
diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-basic.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-basic.any-expected.txt
index 8ac4928..c849905 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-basic.any-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-basic.any-expected.txt
@@ -1,13 +1,13 @@
CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8801/fetch/api/resources/top.txt. Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8801/fetch/api/resources/top.txt due to access control checks.
CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Fetch API cannot load https://localhost:9443/fetch/api/resources/top.txt. Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Fetch API cannot load https://localhost:9443/fetch/api/resources/top.txt due to access control checks.
CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8800/fetch/api/resources/top.txt. Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8800/fetch/api/resources/top.txt due to access control checks.
CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8801/fetch/api/resources/top.txt. Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8801/fetch/api/resources/top.txt due to access control checks.
CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Fetch API cannot load https://127.0.0.1:9443/fetch/api/resources/top.txt. Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Fetch API cannot load https://127.0.0.1:9443/fetch/api/resources/top.txt due to access control checks.
PASS Same domain different port [no-cors mode]
PASS Same domain different port [server forbid CORS]
diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-multiple-origins-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-multiple-origins-expected.txt
index 8da7aa6..ec8fe3b 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-multiple-origins-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-multiple-origins-expected.txt
@@ -1,15 +1,15 @@
CONSOLE MESSAGE: Access-Control-Allow-Origin cannot contain more than one origin.
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8801/fetch/api/resources/preflight.py?origin=%22%22%2C%20http%3A%2F%2Fexample.com%2C%20http%3A%2F%2Flocalhost%3A8800. Access-Control-Allow-Origin cannot contain more than one origin.
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8801/fetch/api/resources/preflight.py?origin=%22%22%2C%20http%3A%2F%2Fexample.com%2C%20http%3A%2F%2Flocalhost%3A8800 due to access control checks.
CONSOLE MESSAGE: Access-Control-Allow-Origin cannot contain more than one origin.
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8801/fetch/api/resources/preflight.py?origin=%22%22%2C%20http%3A%2F%2Fexample.com%2C%20*. Access-Control-Allow-Origin cannot contain more than one origin.
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8801/fetch/api/resources/preflight.py?origin=%22%22%2C%20http%3A%2F%2Fexample.com%2C%20* due to access control checks.
CONSOLE MESSAGE: Access-Control-Allow-Origin cannot contain more than one origin.
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8801/fetch/api/resources/preflight.py?origin=%22%22%2C%20http%3A%2F%2Flocalhost%3A8800%2C%20http%3A%2F%2Flocalhost%3A8800. Access-Control-Allow-Origin cannot contain more than one origin.
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8801/fetch/api/resources/preflight.py?origin=%22%22%2C%20http%3A%2F%2Flocalhost%3A8800%2C%20http%3A%2F%2Flocalhost%3A8800 due to access control checks.
CONSOLE MESSAGE: Access-Control-Allow-Origin cannot contain more than one origin.
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8801/fetch/api/resources/preflight.py?origin=*%2C%20http%3A%2F%2Fexample.com%2C%20*. Access-Control-Allow-Origin cannot contain more than one origin.
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8801/fetch/api/resources/preflight.py?origin=*%2C%20http%3A%2F%2Fexample.com%2C%20* due to access control checks.
CONSOLE MESSAGE: Access-Control-Allow-Origin cannot contain more than one origin.
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8801/fetch/api/resources/preflight.py?origin=*%2C%20http%3A%2F%2Fexample.com%2C%20http%3A%2F%2Flocalhost%3A8800. Access-Control-Allow-Origin cannot contain more than one origin.
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8801/fetch/api/resources/preflight.py?origin=*%2C%20http%3A%2F%2Fexample.com%2C%20http%3A%2F%2Flocalhost%3A8800 due to access control checks.
CONSOLE MESSAGE: Access-Control-Allow-Origin cannot contain more than one origin.
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8801/fetch/api/resources/preflight.py?origin=%2C%20http%3A%2F%2Fexample.com%2C%20https%3A%2F%2Fexample2.com. Access-Control-Allow-Origin cannot contain more than one origin.
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8801/fetch/api/resources/preflight.py?origin=%2C%20http%3A%2F%2Fexample.com%2C%20https%3A%2F%2Fexample2.com due to access control checks.
FAIL 3 origins allowed, match the 3rd (http://localhost:8800) promise_test: Unhandled rejection with value: object "TypeError: Access-Control-Allow-Origin cannot contain more than one origin."
FAIL 3 origins allowed, match the 3rd ("*") promise_test: Unhandled rejection with value: object "TypeError: Access-Control-Allow-Origin cannot contain more than one origin."
diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-origin.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-origin.any.worker-expected.txt
index 3bceadb..e7704fb 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-origin.any.worker-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-origin.any.worker-expected.txt
@@ -6,6 +6,7 @@
CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
PASS Cross domain different subdomain [origin OK]
PASS Cross domain different subdomain [origin KO]
diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-preflight-star.any-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-preflight-star.any-expected.txt
index 5aeac6c..5fd22b9 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-preflight-star.any-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-preflight-star.any-expected.txt
@@ -1,10 +1,17 @@
-CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8800/fetch/api/resources/preflight.py?allow_methods=*&allow_headers=x-test&. Method SUPER is not allowed by Access-Control-Allow-Methods.
-CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8800/fetch/api/resources/preflight.py?allow_methods=*&allow_headers=*&. Method OK is not allowed by Access-Control-Allow-Methods.
-CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8800/fetch/api/resources/preflight.py?origin=http://localhost:8800&credentials&allow_methods=*&allow_headers=*&. Method OK is not allowed by Access-Control-Allow-Methods.
-CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8800/fetch/api/resources/preflight.py?origin=http://localhost:8800&credentials&allow_methods=*&allow_headers=&. Method PUT is not allowed by Access-Control-Allow-Methods.
-CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8800/fetch/api/resources/preflight.py?origin=http://localhost:8800&credentials&allow_methods=get&allow_headers=*&. Request header field X-Test is not allowed by Access-Control-Allow-Headers.
-CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8800/fetch/api/resources/preflight.py?origin=http://localhost:8800&credentials&allow_methods=*&allow_headers=*&. Request header field X-Test is not allowed by Access-Control-Allow-Headers.
-CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8800/fetch/api/resources/preflight.py?origin=http://localhost:8800&credentials&allow_methods=put&allow_headers=*&. Method PUT is not allowed by Access-Control-Allow-Methods.
+CONSOLE MESSAGE: Method SUPER is not allowed by Access-Control-Allow-Methods.
+CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8800/fetch/api/resources/preflight.py?allow_methods=*&allow_headers=x-test& due to access control checks.
+CONSOLE MESSAGE: Method OK is not allowed by Access-Control-Allow-Methods.
+CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8800/fetch/api/resources/preflight.py?allow_methods=*&allow_headers=*& due to access control checks.
+CONSOLE MESSAGE: Method OK is not allowed by Access-Control-Allow-Methods.
+CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8800/fetch/api/resources/preflight.py?origin=http://localhost:8800&credentials&allow_methods=*&allow_headers=*& due to access control checks.
+CONSOLE MESSAGE: Method PUT is not allowed by Access-Control-Allow-Methods.
+CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8800/fetch/api/resources/preflight.py?origin=http://localhost:8800&credentials&allow_methods=*&allow_headers=& due to access control checks.
+CONSOLE MESSAGE: Request header field X-Test is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8800/fetch/api/resources/preflight.py?origin=http://localhost:8800&credentials&allow_methods=get&allow_headers=*& due to access control checks.
+CONSOLE MESSAGE: Request header field X-Test is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8800/fetch/api/resources/preflight.py?origin=http://localhost:8800&credentials&allow_methods=*&allow_headers=*& due to access control checks.
+CONSOLE MESSAGE: Method PUT is not allowed by Access-Control-Allow-Methods.
+CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8800/fetch/api/resources/preflight.py?origin=http://localhost:8800&credentials&allow_methods=put&allow_headers=*& due to access control checks.
PASS CORS that succeeds with credentials: false; method: GET (allowed: get); header: X-Test,1 (allowed: x-test)
FAIL CORS that succeeds with credentials: false; method: SUPER (allowed: *); header: X-Test,1 (allowed: x-test) promise_test: Unhandled rejection with value: object "TypeError: Method SUPER is not allowed by Access-Control-Allow-Methods."
diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-preflight-star.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-preflight-star.any.worker-expected.txt
index 47a3cb4..3afb4fb 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-preflight-star.any.worker-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-preflight-star.any.worker-expected.txt
@@ -1,3 +1,10 @@
+CONSOLE MESSAGE: Method SUPER is not allowed by Access-Control-Allow-Methods.
+CONSOLE MESSAGE: Method OK is not allowed by Access-Control-Allow-Methods.
+CONSOLE MESSAGE: Method OK is not allowed by Access-Control-Allow-Methods.
+CONSOLE MESSAGE: Method PUT is not allowed by Access-Control-Allow-Methods.
+CONSOLE MESSAGE: Request header field X-Test is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: Request header field X-Test is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: Method PUT is not allowed by Access-Control-Allow-Methods.
PASS CORS that succeeds with credentials: false; method: GET (allowed: get); header: X-Test,1 (allowed: x-test)
FAIL CORS that succeeds with credentials: false; method: SUPER (allowed: *); header: X-Test,1 (allowed: x-test) promise_test: Unhandled rejection with value: object "TypeError: Method SUPER is not allowed by Access-Control-Allow-Methods."
diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-preflight-status.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-preflight-status.any.worker-expected.txt
index 400c5c6..88a63f7 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-preflight-status.any.worker-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-preflight-status.any.worker-expected.txt
@@ -1,3 +1,23 @@
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: Preflight response is not successful
PASS Preflight answered with status 200
PASS Preflight answered with status 201
diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-preflight.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-preflight.any.worker-expected.txt
index a27e27b5..d651174 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-preflight.any.worker-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-preflight.any.worker-expected.txt
@@ -1,3 +1,10 @@
+CONSOLE MESSAGE: Method DELETE is not allowed by Access-Control-Allow-Methods.
+CONSOLE MESSAGE: Method PUT is not allowed by Access-Control-Allow-Methods.
+CONSOLE MESSAGE: Method PATCH is not allowed by Access-Control-Allow-Methods.
+CONSOLE MESSAGE: Method NEW is not allowed by Access-Control-Allow-Methods.
+CONSOLE MESSAGE: Request header field x-test-header1 is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: Request header field Content-Type is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: Method PUT is not allowed by Access-Control-Allow-Methods.
PASS CORS [DELETE], server allows
PASS CORS [DELETE], server refuses
diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-redirect-preflight.any.worker-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-redirect-preflight.any.worker-expected.txt
index f63a241..95d9f93 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-redirect-preflight.any.worker-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-redirect-preflight.any.worker-expected.txt
@@ -1,3 +1,18 @@
+CONSOLE MESSAGE: Request header field x-w3c is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: Request header field x-w3c is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: Request header field x-w3c is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: Request header field x-w3c is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: Request header field x-w3c is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: Request header field x-w3c is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: Request header field x-w3c is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: Request header field x-w3c is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: Request header field x-w3c is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: Request header field x-w3c is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: Request header field x-w3c is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: Request header field x-w3c is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: Request header field x-w3c is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: Request header field x-w3c is not allowed by Access-Control-Allow-Headers.
+CONSOLE MESSAGE: Request header field x-w3c is not allowed by Access-Control-Allow-Headers.
PASS Redirect 301: same origin to cors (preflight after redirection success case)
PASS Redirect 301: same origin to cors (preflight after redirection failure case)
diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/redirect/redirect-schemes-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/redirect/redirect-schemes-expected.txt
index ecd7534..1777cd6 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/redirect/redirect-schemes-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/redirect/redirect-schemes-expected.txt
@@ -1,13 +1,13 @@
CONSOLE MESSAGE: Cross-origin redirection to mailto:a@a.com denied by Cross-Origin Resource Sharing policy: URL is either a non-HTTP URL or contains credentials.
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8800/fetch/api/resources/redirect.py?location=mailto:a@a.com. Cross-origin redirection to mailto:a@a.com denied by Cross-Origin Resource Sharing policy: URL is either a non-HTTP URL or contains credentials.
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8800/fetch/api/resources/redirect.py?location=mailto:a@a.com due to access control checks.
CONSOLE MESSAGE: Cross-origin redirection to data:,HI denied by Cross-Origin Resource Sharing policy: URL is either a non-HTTP URL or contains credentials.
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8800/fetch/api/resources/redirect.py?location=data:,HI. Cross-origin redirection to data:,HI denied by Cross-Origin Resource Sharing policy: URL is either a non-HTTP URL or contains credentials.
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8800/fetch/api/resources/redirect.py?location=data:,HI due to access control checks.
CONSOLE MESSAGE: Cross-origin redirection to facetime:a@a.org denied by Cross-Origin Resource Sharing policy: URL is either a non-HTTP URL or contains credentials.
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8800/fetch/api/resources/redirect.py?location=facetime:a@a.org. Cross-origin redirection to facetime:a@a.org denied by Cross-Origin Resource Sharing policy: URL is either a non-HTTP URL or contains credentials.
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8800/fetch/api/resources/redirect.py?location=facetime:a@a.org due to access control checks.
CONSOLE MESSAGE: Cross-origin redirection to about:blank denied by Cross-Origin Resource Sharing policy: URL is either a non-HTTP URL or contains credentials.
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8800/fetch/api/resources/redirect.py?location=about:blank. Cross-origin redirection to about:blank denied by Cross-Origin Resource Sharing policy: URL is either a non-HTTP URL or contains credentials.
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8800/fetch/api/resources/redirect.py?location=about:blank due to access control checks.
CONSOLE MESSAGE: Cross-origin redirection to about:unicorn denied by Cross-Origin Resource Sharing policy: URL is either a non-HTTP URL or contains credentials.
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8800/fetch/api/resources/redirect.py?location=about:unicorn. Cross-origin redirection to about:unicorn denied by Cross-Origin Resource Sharing policy: URL is either a non-HTTP URL or contains credentials.
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8800/fetch/api/resources/redirect.py?location=about:unicorn due to access control checks.
CONSOLE MESSAGE: Not allowed to load local resource: blob:djfksfjs
PASS Fetch: handling different schemes in redirects
diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/redirect/redirect-to-dataurl-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/redirect/redirect-to-dataurl-expected.txt
index 5185707..1df2e95 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/redirect/redirect-to-dataurl-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/redirect/redirect-to-dataurl-expected.txt
@@ -1,11 +1,13 @@
CONSOLE MESSAGE: Cross-origin redirection to data:text/plain;base64,cmVzcG9uc2UncyBib2R5 denied by Cross-Origin Resource Sharing policy: URL is either a non-HTTP URL or contains credentials.
-CONSOLE MESSAGE: Fetch API cannot load http://localhost:8800/fetch/api/resources/redirect.py?cors&location=data%3Atext%2Fplain%3Bbase64%2CcmVzcG9uc2UncyBib2R5. Cross-origin redirection to data:text/plain;base64,cmVzcG9uc2UncyBib2R5 denied by Cross-Origin Resource Sharing policy: URL is either a non-HTTP URL or contains credentials.
-CONSOLE MESSAGE: Fetch API cannot load data:text/plain;base64,cmVzcG9uc2UncyBib2R5. Redirection to URL with a scheme that is not HTTP(S).
+CONSOLE MESSAGE: Fetch API cannot load http://localhost:8800/fetch/api/resources/redirect.py?cors&location=data%3Atext%2Fplain%3Bbase64%2CcmVzcG9uc2UncyBib2R5 due to access control checks.
+CONSOLE MESSAGE: Redirection to URL with a scheme that is not HTTP(S).
+CONSOLE MESSAGE: Fetch API cannot load data:text/plain;base64,cmVzcG9uc2UncyBib2R5 due to access control checks.
CONSOLE MESSAGE: Unsafe attempt to load URL data:text/plain;base64,cmVzcG9uc2UncyBib2R5 from frame with URL http://localhost:8800/fetch/api/redirect/redirect-to-dataurl.html. Domains, protocols and ports must match.
CONSOLE MESSAGE: Cross-origin redirection to data:text/plain;base64,cmVzcG9uc2UncyBib2R5 denied by Cross-Origin Resource Sharing policy: URL is either a non-HTTP URL or contains credentials.
-CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8800/fetch/api/resources/redirect.py?cors&location=data%3Atext%2Fplain%3Bbase64%2CcmVzcG9uc2UncyBib2R5. Cross-origin redirection to data:text/plain;base64,cmVzcG9uc2UncyBib2R5 denied by Cross-Origin Resource Sharing policy: URL is either a non-HTTP URL or contains credentials.
-CONSOLE MESSAGE: Fetch API cannot load data:text/plain;base64,cmVzcG9uc2UncyBib2R5. Redirection to URL with a scheme that is not HTTP(S).
+CONSOLE MESSAGE: Fetch API cannot load http://127.0.0.1:8800/fetch/api/resources/redirect.py?cors&location=data%3Atext%2Fplain%3Bbase64%2CcmVzcG9uc2UncyBib2R5 due to access control checks.
+CONSOLE MESSAGE: Redirection to URL with a scheme that is not HTTP(S).
+CONSOLE MESSAGE: Fetch API cannot load data:text/plain;base64,cmVzcG9uc2UncyBib2R5 due to access control checks.
PASS Testing data URL loading after same-origin redirection (cors mode)
PASS Testing data URL loading after same-origin redirection (no-cors mode)
diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-keepalive-quota-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-keepalive-quota-expected.txt
index 622a6a2..283ff48 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-keepalive-quota-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-keepalive-quota-expected.txt
@@ -1,6 +1,9 @@
-CONSOLE MESSAGE: line 33: Fetch API cannot load http://localhost:8800/fetch/api/resources/trickle.py?count=1&ms=0. Reached maximum amount of queued data of 64Kb for keepalive requests
-CONSOLE MESSAGE: line 33: Fetch API cannot load http://localhost:8800/fetch/api/resources/trickle.py?count=1&ms=0. Reached maximum amount of queued data of 64Kb for keepalive requests
-CONSOLE MESSAGE: line 33: Fetch API cannot load http://localhost:8800/fetch/api/resources/trickle.py?count=1&ms=0. Reached maximum amount of queued data of 64Kb for keepalive requests
+CONSOLE MESSAGE: line 33: Reached maximum amount of queued data of 64Kb for keepalive requests
+CONSOLE MESSAGE: line 33: Fetch API cannot load http://localhost:8800/fetch/api/resources/trickle.py?count=1&ms=0 due to access control checks.
+CONSOLE MESSAGE: line 33: Reached maximum amount of queued data of 64Kb for keepalive requests
+CONSOLE MESSAGE: line 33: Fetch API cannot load http://localhost:8800/fetch/api/resources/trickle.py?count=1&ms=0 due to access control checks.
+CONSOLE MESSAGE: line 33: Reached maximum amount of queued data of 64Kb for keepalive requests
+CONSOLE MESSAGE: line 33: Fetch API cannot load http://localhost:8800/fetch/api/resources/trickle.py?count=1&ms=0 due to access control checks.
PASS A Keep-Alive fetch() with a small body should succeed.
PASS A Keep-Alive fetch() with a body at the Quota Limit should succeed.
diff --git a/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/fetch-event-redirect.https-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/fetch-event-redirect.https-expected.txt
index 3dcc2a2..a97cea3 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/fetch-event-redirect.https-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/fetch-event-redirect.https-expected.txt
@@ -1,7 +1,9 @@
CONSOLE MESSAGE: line 51: No-Cors mode requires follow redirect mode
-CONSOLE MESSAGE: line 51: Fetch API cannot load https://localhost:9443/nonav-manual-nocors-redirects-to-sameorigin-nocreds?url=redirect.py%3FRedirect%3Dhttps%253A%252F%252Flocalhost%253A9443%252Fservice-workers%252Fservice-worker%252Fresources%252Fsuccess.py&expected_type=opaqueredirect. Not allowed to request resource
+CONSOLE MESSAGE: line 51: Not allowed to request resource
+CONSOLE MESSAGE: line 51: Fetch API cannot load https://localhost:9443/nonav-manual-nocors-redirects-to-sameorigin-nocreds?url=redirect.py%3FRedirect%3Dhttps%253A%252F%252Flocalhost%253A9443%252Fservice-workers%252Fservice-worker%252Fresources%252Fsuccess.py&expected_type=opaqueredirect due to access control checks.
CONSOLE MESSAGE: line 51: No-Cors mode requires follow redirect mode
-CONSOLE MESSAGE: line 51: Fetch API cannot load https://localhost:9443/nonav-error-nocors-redirects-to-sameorigin-nocreds?url=redirect.py%3FRedirect%3Dhttps%253A%252F%252Flocalhost%253A9443%252Fservice-workers%252Fservice-worker%252Fresources%252Fsuccess.py. Not allowed to request resource
+CONSOLE MESSAGE: line 51: Not allowed to request resource
+CONSOLE MESSAGE: line 51: Fetch API cannot load https://localhost:9443/nonav-error-nocors-redirects-to-sameorigin-nocreds?url=redirect.py%3FRedirect%3Dhttps%253A%252F%252Flocalhost%253A9443%252Fservice-workers%252Fservice-worker%252Fresources%252Fsuccess.py due to access control checks.
PASS initialize global state
PASS Non-navigation, manual redirect, cors mode Request redirected to same-origin without credentials should succeed opaqueredirect interception and response should not be redirected
diff --git a/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/fetch-request-fallback.https-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/fetch-request-fallback.https-expected.txt
index c8b5244..2d64762 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/fetch-request-fallback.https-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/fetch-request-fallback.https-expected.txt
@@ -3,9 +3,9 @@
CONSOLE MESSAGE: Origin https://localhost:9443 is not allowed by Access-Control-Allow-Origin.
CONSOLE MESSAGE: XMLHttpRequest cannot load https://127.0.0.1:9443/service-workers/service-worker/resources/fetch-access-control.py? due to access control checks.
CONSOLE MESSAGE: Origin https://localhost:9443 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Cross-origin image load denied by Cross-Origin Resource Sharing policy.
+CONSOLE MESSAGE: Cannot load image https://127.0.0.1:9443/service-workers/service-worker/resources/fetch-access-control.py?PNGIMAGE& due to access control checks.
CONSOLE MESSAGE: Origin https://localhost:9443 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: Cross-origin image load denied by Cross-Origin Resource Sharing policy.
+CONSOLE MESSAGE: Cannot load image https://localhost:9443/service-workers/service-worker/resources/redirect.py?Redirect=https%3A%2F%2F127.0.0.1%3A9443%2Fservice-workers%2Fservice-worker%2Fresources%2Ffetch-access-control.py%3FPNGIMAGE%26 due to access control checks.
PASS initialize global state
PASS The SW must intercept the request for a main resource.
diff --git a/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/fetch-request-redirect.https-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/fetch-request-redirect.https-expected.txt
index 261dc7c..df89986 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/fetch-request-redirect.https-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/fetch-request-redirect.https-expected.txt
@@ -1,3 +1,6 @@
+CONSOLE MESSAGE: Response served by service worker is opaque redirect
+CONSOLE MESSAGE: XMLHttpRequest cannot load https://localhost:9443/service-workers/service-worker/resources/redirect.py?Redirect=%2Fservice-workers%2Fservice-worker%2Fresources%2Fsimple.txt due to access control checks.
+CONSOLE MESSAGE: Response served by service worker has redirections
PASS Verify redirect mode of Fetch API and ServiceWorker FetchEvent.
PASS Verify redirected of Response(Fetch API) and ServiceWorker FetchEvent.
diff --git a/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/opaque-response-preloaded.https-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/opaque-response-preloaded.https-expected.txt
index fa0f65a..46415e9 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/opaque-response-preloaded.https-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/opaque-response-preloaded.https-expected.txt
@@ -1,5 +1,7 @@
-CONSOLE MESSAGE: XMLHttpRequest cannot load https://127.0.0.1:9443/service-workers/service-worker/resources/simple.txt. Response served by service worker is opaque
-CONSOLE MESSAGE: XMLHttpRequest cannot load https://127.0.0.1:9443/service-workers/service-worker/resources/simple.txt. Response served by service worker is opaque
+CONSOLE MESSAGE: Response served by service worker is opaque
+CONSOLE MESSAGE: XMLHttpRequest cannot load https://127.0.0.1:9443/service-workers/service-worker/resources/simple.txt due to access control checks.
+CONSOLE MESSAGE: Response served by service worker is opaque
+CONSOLE MESSAGE: XMLHttpRequest cannot load https://127.0.0.1:9443/service-workers/service-worker/resources/simple.txt due to access control checks.
PASS Opaque responses should not be reused for XHRs, loading case
PASS Opaque responses should not be reused for XHRs, done case
diff --git a/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/redirected-response.https-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/redirected-response.https-expected.txt
index d7d7ca1..11bd135 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/redirected-response.https-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/redirected-response.https-expected.txt
@@ -1,8 +1,12 @@
-CONSOLE MESSAGE: Fetch API cannot load https://localhost:9443/service-workers/service-worker/resources/redirect.py?Redirect=https%3A%2F%2Flocalhost%3A9443%2Fservice-workers%2Fservice-worker%2Fresources%2Fsimple.txt%3F&error. Redirections are not allowed
-CONSOLE MESSAGE: Fetch API cannot load https://localhost:9443/service-workers/service-worker/resources/simple.txt?. Response served by service worker has redirections
-CONSOLE MESSAGE: Fetch API cannot load https://localhost:9443/service-workers/service-worker/resources/simple.txt?. Response served by service worker has redirections
-CONSOLE MESSAGE: Fetch API cannot load https://localhost:9443/service-workers/service-worker/resources/redirect.py?Redirect=https%3A%2F%2Flocalhost%3A9443%2Fservice-workers%2Fservice-worker%2Fresources%2Fsimple.txt%3F&original-redirect-mode=follow&sw=manual. Response served by service worker is opaque redirect
-CONSOLE MESSAGE: Fetch API cannot load https://localhost:9443/service-workers/service-worker/resources/redirect.py?Redirect=https%3A%2F%2Flocalhost%3A9443%2Fservice-workers%2Fservice-worker%2Fresources%2Fsimple.txt%3F&original-redirect-mode=error&sw=manual. Response served by service worker is opaque redirect
+CONSOLE MESSAGE: Fetch API cannot load https://localhost:9443/service-workers/service-worker/resources/redirect.py?Redirect=https%3A%2F%2Flocalhost%3A9443%2Fservice-workers%2Fservice-worker%2Fresources%2Fsimple.txt%3F&error due to access control checks.
+CONSOLE MESSAGE: Response served by service worker has redirections
+CONSOLE MESSAGE: Fetch API cannot load https://localhost:9443/service-workers/service-worker/resources/simple.txt? due to access control checks.
+CONSOLE MESSAGE: Response served by service worker has redirections
+CONSOLE MESSAGE: Fetch API cannot load https://localhost:9443/service-workers/service-worker/resources/simple.txt? due to access control checks.
+CONSOLE MESSAGE: Response served by service worker is opaque redirect
+CONSOLE MESSAGE: Fetch API cannot load https://localhost:9443/service-workers/service-worker/resources/redirect.py?Redirect=https%3A%2F%2Flocalhost%3A9443%2Fservice-workers%2Fservice-worker%2Fresources%2Fsimple.txt%3F&original-redirect-mode=follow&sw=manual due to access control checks.
+CONSOLE MESSAGE: Response served by service worker is opaque redirect
+CONSOLE MESSAGE: Fetch API cannot load https://localhost:9443/service-workers/service-worker/resources/redirect.py?Redirect=https%3A%2F%2Flocalhost%3A9443%2Fservice-workers%2Fservice-worker%2Fresources%2Fsimple.txt%3F&original-redirect-mode=error&sw=manual due to access control checks.
PASS initialize global state (service worker registration and caches)
PASS mode: "follow", non-intercepted request, no server redirect
diff --git a/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/registration-security-error.https-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/registration-security-error.https-expected.txt
index fae5ef2..915d690 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/registration-security-error.https-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/service-workers/service-worker/registration-security-error.https-expected.txt
@@ -1,3 +1,4 @@
+CONSOLE MESSAGE: Cannot load https://localhost:9443/service-workers/service-worker/resources/redirect.py?Redirect=%2Fservice-workers%2Fservice-worker%2Fresources%2Fregistration-worker.js due to access control checks.
PASS Registering same scope as the script directory without the last slash
PASS Registration scope outside the script directory
diff --git a/LayoutTests/platform/mac-wk1/http/tests/xmlhttprequest/access-control-and-redirects-expected.txt b/LayoutTests/platform/mac-wk1/http/tests/xmlhttprequest/access-control-and-redirects-expected.txt
index c1c2cd1..6c99585 100644
--- a/LayoutTests/platform/mac-wk1/http/tests/xmlhttprequest/access-control-and-redirects-expected.txt
+++ b/LayoutTests/platform/mac-wk1/http/tests/xmlhttprequest/access-control-and-redirects-expected.txt
@@ -1,6 +1,7 @@
CONSOLE MESSAGE: Cross-origin redirection to http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi denied by Cross-Origin Resource Sharing policy: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/resources/redirect.php?url=http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi due to access control checks.
-CONSOLE MESSAGE: line 25: XMLHttpRequest cannot load http://localhost:8000/resources/redirect.php?url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow.cgi. Cross-origin redirection denied by Cross-Origin Resource Sharing policy.
+CONSOLE MESSAGE: line 25: Cross-origin redirection denied by Cross-Origin Resource Sharing policy.
+CONSOLE MESSAGE: line 25: XMLHttpRequest cannot load http://localhost:8000/resources/redirect.php?url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow.cgi due to access control checks.
CONSOLE MESSAGE: Cross-origin redirection to http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow.cgi denied by Cross-Origin Resource Sharing policy: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/resources/redirect.php?url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow.cgi due to access control checks.
Tests that redirects between origins are never allowed, even when access control is involved.
diff --git a/LayoutTests/platform/mac-wk1/http/tests/xmlhttprequest/access-control-preflight-not-successful-expected.txt b/LayoutTests/platform/mac-wk1/http/tests/xmlhttprequest/access-control-preflight-not-successful-expected.txt
index d5feba5..652291d 100644
--- a/LayoutTests/platform/mac-wk1/http/tests/xmlhttprequest/access-control-preflight-not-successful-expected.txt
+++ b/LayoutTests/platform/mac-wk1/http/tests/xmlhttprequest/access-control-preflight-not-successful-expected.txt
@@ -1,8 +1,13 @@
-CONSOLE MESSAGE: line 26: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cors.php?redirect-preflight=true&access-control-allow-headers=x-webkit&access-control-allow-origin=*&url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi. Cross-origin redirection denied by Cross-Origin Resource Sharing policy.
-CONSOLE MESSAGE: line 26: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cors.php?redirect-preflight=true&access-control-allow-headers=x-webkit&access-control-allow-origin=*&url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi. Preflight response is not successful
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cors.php?redirect-preflight=true&access-control-allow-headers=x-webkit&access-control-allow-origin=*&url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi. Preflight response is not successful
-CONSOLE MESSAGE: line 26: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/status-404-without-body.php. Preflight response is not successful
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/status-404-without-body.php. Preflight response is not successful
+CONSOLE MESSAGE: line 26: Cross-origin redirection denied by Cross-Origin Resource Sharing policy.
+CONSOLE MESSAGE: line 26: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cors.php?redirect-preflight=true&access-control-allow-headers=x-webkit&access-control-allow-origin=*&url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi due to access control checks.
+CONSOLE MESSAGE: line 26: Preflight response is not successful
+CONSOLE MESSAGE: line 26: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cors.php?redirect-preflight=true&access-control-allow-headers=x-webkit&access-control-allow-origin=*&url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi due to access control checks.
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cors.php?redirect-preflight=true&access-control-allow-headers=x-webkit&access-control-allow-origin=*&url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi due to access control checks.
+CONSOLE MESSAGE: line 26: Preflight response is not successful
+CONSOLE MESSAGE: line 26: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/status-404-without-body.php due to access control checks.
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/status-404-without-body.php due to access control checks.
Tests that not successful preflight responses make preflight failing
Testing http://localhost:8000/xmlhttprequest/resources/redirect-cors.php?redirect-preflight=true&access-control-allow-headers=x-webkit&access-control-allow-origin=*&url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi (sync)
diff --git a/LayoutTests/platform/mac-wk1/http/tests/xmlhttprequest/cross-origin-no-authorization-expected.txt b/LayoutTests/platform/mac-wk1/http/tests/xmlhttprequest/cross-origin-no-authorization-expected.txt
index 8af9775..00d8000 100644
--- a/LayoutTests/platform/mac-wk1/http/tests/xmlhttprequest/cross-origin-no-authorization-expected.txt
+++ b/LayoutTests/platform/mac-wk1/http/tests/xmlhttprequest/cross-origin-no-authorization-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: line 56: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cross-origin-no-authorization.php. Credentials flag is true, but Access-Control-Allow-Credentials is not "true".
+CONSOLE MESSAGE: line 56: Credentials flag is true, but Access-Control-Allow-Credentials is not "true".
+CONSOLE MESSAGE: line 56: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cross-origin-no-authorization.php due to access control checks.
CONSOLE MESSAGE: Credentials flag is true, but Access-Control-Allow-Credentials is not "true".
CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cross-origin-no-authorization.php due to access control checks.
Start
diff --git a/LayoutTests/platform/mac-wk1/http/tests/xmlhttprequest/redirect-cross-origin-tripmine-expected.txt b/LayoutTests/platform/mac-wk1/http/tests/xmlhttprequest/redirect-cross-origin-tripmine-expected.txt
index abe6a01..437f489 100644
--- a/LayoutTests/platform/mac-wk1/http/tests/xmlhttprequest/redirect-cross-origin-tripmine-expected.txt
+++ b/LayoutTests/platform/mac-wk1/http/tests/xmlhttprequest/redirect-cross-origin-tripmine-expected.txt
@@ -1,13 +1,23 @@
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
Test that a cross-origin redirect does not result in a non-simple request being sent to the target.
Asynchronous XMLHttpRequest 307 POST redirect:
diff --git a/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-expected.txt b/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-expected.txt
index 5f4ba5b..d9a853e 100644
--- a/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-expected.txt
+++ b/LayoutTests/platform/mac-wk1/imported/w3c/web-platform-tests/XMLHttpRequest/access-control-and-redirects-expected.txt
@@ -1,4 +1,3 @@
-CONSOLE MESSAGE: line 15: XMLHttpRequest cannot load http://127.0.0.1:8800/XMLHttpRequest/resources/redirect-cors.py?location=http://127.0.0.1:8800/XMLHttpRequest/resources/access-control-basic-allow.py&allow_origin=true. Cross-origin redirection denied by Cross-Origin Resource Sharing policy.
FAIL Local sync redirect to remote origin A network error occurred.
PASS Local async redirect to remote origin
diff --git a/LayoutTests/platform/win/http/tests/xmlhttprequest/access-control-and-redirects-expected.txt b/LayoutTests/platform/win/http/tests/xmlhttprequest/access-control-and-redirects-expected.txt
index c1c2cd1..6c99585 100644
--- a/LayoutTests/platform/win/http/tests/xmlhttprequest/access-control-and-redirects-expected.txt
+++ b/LayoutTests/platform/win/http/tests/xmlhttprequest/access-control-and-redirects-expected.txt
@@ -1,6 +1,7 @@
CONSOLE MESSAGE: Cross-origin redirection to http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi denied by Cross-Origin Resource Sharing policy: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/resources/redirect.php?url=http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow.cgi due to access control checks.
-CONSOLE MESSAGE: line 25: XMLHttpRequest cannot load http://localhost:8000/resources/redirect.php?url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow.cgi. Cross-origin redirection denied by Cross-Origin Resource Sharing policy.
+CONSOLE MESSAGE: line 25: Cross-origin redirection denied by Cross-Origin Resource Sharing policy.
+CONSOLE MESSAGE: line 25: XMLHttpRequest cannot load http://localhost:8000/resources/redirect.php?url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow.cgi due to access control checks.
CONSOLE MESSAGE: Cross-origin redirection to http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow.cgi denied by Cross-Origin Resource Sharing policy: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/resources/redirect.php?url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow.cgi due to access control checks.
Tests that redirects between origins are never allowed, even when access control is involved.
diff --git a/LayoutTests/platform/win/http/tests/xmlhttprequest/access-control-preflight-not-successful-expected.txt b/LayoutTests/platform/win/http/tests/xmlhttprequest/access-control-preflight-not-successful-expected.txt
index d5feba5..652291d 100644
--- a/LayoutTests/platform/win/http/tests/xmlhttprequest/access-control-preflight-not-successful-expected.txt
+++ b/LayoutTests/platform/win/http/tests/xmlhttprequest/access-control-preflight-not-successful-expected.txt
@@ -1,8 +1,13 @@
-CONSOLE MESSAGE: line 26: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cors.php?redirect-preflight=true&access-control-allow-headers=x-webkit&access-control-allow-origin=*&url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi. Cross-origin redirection denied by Cross-Origin Resource Sharing policy.
-CONSOLE MESSAGE: line 26: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cors.php?redirect-preflight=true&access-control-allow-headers=x-webkit&access-control-allow-origin=*&url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi. Preflight response is not successful
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cors.php?redirect-preflight=true&access-control-allow-headers=x-webkit&access-control-allow-origin=*&url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi. Preflight response is not successful
-CONSOLE MESSAGE: line 26: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/status-404-without-body.php. Preflight response is not successful
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/status-404-without-body.php. Preflight response is not successful
+CONSOLE MESSAGE: line 26: Cross-origin redirection denied by Cross-Origin Resource Sharing policy.
+CONSOLE MESSAGE: line 26: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cors.php?redirect-preflight=true&access-control-allow-headers=x-webkit&access-control-allow-origin=*&url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi due to access control checks.
+CONSOLE MESSAGE: line 26: Preflight response is not successful
+CONSOLE MESSAGE: line 26: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cors.php?redirect-preflight=true&access-control-allow-headers=x-webkit&access-control-allow-origin=*&url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi due to access control checks.
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cors.php?redirect-preflight=true&access-control-allow-headers=x-webkit&access-control-allow-origin=*&url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi due to access control checks.
+CONSOLE MESSAGE: line 26: Preflight response is not successful
+CONSOLE MESSAGE: line 26: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/status-404-without-body.php due to access control checks.
+CONSOLE MESSAGE: Preflight response is not successful
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/status-404-without-body.php due to access control checks.
Tests that not successful preflight responses make preflight failing
Testing http://localhost:8000/xmlhttprequest/resources/redirect-cors.php?redirect-preflight=true&access-control-allow-headers=x-webkit&access-control-allow-origin=*&url=http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi (sync)
diff --git a/LayoutTests/platform/win/http/tests/xmlhttprequest/cross-origin-no-authorization-expected.txt b/LayoutTests/platform/win/http/tests/xmlhttprequest/cross-origin-no-authorization-expected.txt
index 8af9775..00d8000 100644
--- a/LayoutTests/platform/win/http/tests/xmlhttprequest/cross-origin-no-authorization-expected.txt
+++ b/LayoutTests/platform/win/http/tests/xmlhttprequest/cross-origin-no-authorization-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: line 56: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cross-origin-no-authorization.php. Credentials flag is true, but Access-Control-Allow-Credentials is not "true".
+CONSOLE MESSAGE: line 56: Credentials flag is true, but Access-Control-Allow-Credentials is not "true".
+CONSOLE MESSAGE: line 56: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cross-origin-no-authorization.php due to access control checks.
CONSOLE MESSAGE: Credentials flag is true, but Access-Control-Allow-Credentials is not "true".
CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cross-origin-no-authorization.php due to access control checks.
Start
diff --git a/LayoutTests/platform/win/http/tests/xmlhttprequest/redirect-cross-origin-tripmine-expected.txt b/LayoutTests/platform/win/http/tests/xmlhttprequest/redirect-cross-origin-tripmine-expected.txt
index abe6a01..437f489 100644
--- a/LayoutTests/platform/win/http/tests/xmlhttprequest/redirect-cross-origin-tripmine-expected.txt
+++ b/LayoutTests/platform/win/http/tests/xmlhttprequest/redirect-cross-origin-tripmine-expected.txt
@@ -1,13 +1,23 @@
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
-CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
+CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php due to access control checks.
Test that a cross-origin redirect does not result in a non-simple request being sent to the target.
Asynchronous XMLHttpRequest 307 POST redirect:
diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-iframe-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-iframe-expected.txt
index 65c6b54..267d3ac 100644
--- a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-iframe-expected.txt
+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-iframe-expected.txt
@@ -2,7 +2,8 @@
frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
CONSOLE MESSAGE: Blocked mixed content http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi because 'block-all-mixed-content' appears in the Content Security Policy.
-CONSOLE MESSAGE: line 30: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi. Not allowed to request resource
+CONSOLE MESSAGE: line 30: Not allowed to request resource
+CONSOLE MESSAGE: line 30: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi due to access control checks.
frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
main frame - didHandleOnloadEventsForFrame
diff --git a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-main-frame-expected.txt b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-main-frame-expected.txt
index 549810f..0d8d627 100644
--- a/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-main-frame-expected.txt
+++ b/LayoutTests/platform/wk2/http/tests/security/contentSecurityPolicy/block-all-mixed-content/insecure-xhr-asynchronous-in-main-frame-expected.txt
@@ -4,7 +4,8 @@
main frame - didStartProvisionalLoadForFrame
main frame - didCommitLoadForFrame
CONSOLE MESSAGE: Blocked mixed content http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi because 'block-all-mixed-content' appears in the Content Security Policy.
-CONSOLE MESSAGE: line 30: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi. Not allowed to request resource
+CONSOLE MESSAGE: line 30: Not allowed to request resource
+CONSOLE MESSAGE: line 30: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi due to access control checks.
main frame - didFinishDocumentLoadForFrame
main frame - didHandleOnloadEventsForFrame
main frame - didFinishLoadForFrame
diff --git a/LayoutTests/security/cannot-read-self-from-file-expected.txt b/LayoutTests/security/cannot-read-self-from-file-expected.txt
index 829f8f3..adc1343 100644
--- a/LayoutTests/security/cannot-read-self-from-file-expected.txt
+++ b/LayoutTests/security/cannot-read-self-from-file-expected.txt
@@ -1,4 +1,5 @@
-CONSOLE MESSAGE: line 8: XMLHttpRequest cannot load cannot-read-self-from-file.html. Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 8: Cross origin requests are only supported for HTTP.
+CONSOLE MESSAGE: line 8: XMLHttpRequest cannot load cannot-read-self-from-file.html due to access control checks.
Documents loaded from file: shouldn't be able to access themselves via XHR.
PASS file: should be a unique-origin protocol for XHR purposes
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 02d5da8..f55f52e 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,42 @@
+2018-04-25 Youenn Fablet <youenn@apple.com>
+
+ Make DocumentThreadableLoader error logging more consistent
+ https://bugs.webkit.org/show_bug.cgi?id=184853
+
+ Reviewed by Chris Dumez.
+
+ Covered by rebased tests.
+ Make EventSource, XHR and Fetch log error messages consistently.
+ This patch also prepares consistent error logging between WK1 and WK2 as WK2 NetworkProcess
+ will issue more and more errors in places different from WK1.
+ This is the reason for SubresourceLoader changes in this patch and DTL/didFail/preflightFailure changes.
+
+ Update ImageLoader error message to be more general than CORS.
+
+ * loader/CrossOriginPreflightChecker.cpp:
+ (WebCore::CrossOriginPreflightChecker::doPreflight): Add some more logging for consistency between WK1 and WK2.
+ (WebCore::CrossOriginPreflightChecker::validatePreflightResponse): Ditto.
+ * loader/DocumentThreadableLoader.cpp:
+ (WebCore::DocumentThreadableLoader::didFail):
+ (WebCore::DocumentThreadableLoader::preflightFailure):
+ (WebCore::DocumentThreadableLoader::logErrorAndFail):
+ * loader/ImageLoader.cpp:
+ (WebCore::ImageLoader::notifyFinished):
+ * loader/SubresourceLoader.cpp:
+ (WebCore::SubresourceLoader::didFail):
+ * loader/ThreadableLoader.cpp:
+ (WebCore::ThreadableLoader::logError):
+ * loader/cache/CachedResource.cpp:
+ (WebCore::CachedResource::load):
+ * loader/cache/CachedResourceRequestInitiators.cpp:
+ (WebCore::CachedResourceRequestInitiators::CachedResourceRequestInitiators):
+ * loader/cache/CachedResourceRequestInitiators.h:
+ * page/EventSource.cpp:
+ (WebCore::EventSource::connect):
+ (WebCore::EventSource::didFail):
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::didFail):
+
2018-04-25 Zalan Bujtas <zalan@apple.com>
[LFC] Implement Layout::Box functions.
diff --git a/Source/WebCore/loader/CrossOriginPreflightChecker.cpp b/Source/WebCore/loader/CrossOriginPreflightChecker.cpp
index 98f8b15..f2c5f5c 100644
--- a/Source/WebCore/loader/CrossOriginPreflightChecker.cpp
+++ b/Source/WebCore/loader/CrossOriginPreflightChecker.cpp
@@ -60,15 +60,18 @@
void CrossOriginPreflightChecker::validatePreflightResponse(DocumentThreadableLoader& loader, ResourceRequest&& request, unsigned long identifier, const ResourceResponse& response)
{
+ auto* frame = loader.document().frame();
+ ASSERT(frame);
+
String errorDescription;
if (!WebCore::validatePreflightResponse(request, response, loader.options().storedCredentialsPolicy, loader.securityOrigin(), errorDescription)) {
+ if (auto* document = frame->document())
+ document->addConsoleMessage(MessageSource::Security, MessageLevel::Error, errorDescription);
+
loader.preflightFailure(identifier, ResourceError(errorDomainWebKitInternal, 0, request.url(), errorDescription, ResourceError::Type::AccessControl));
return;
}
- Frame* frame = loader.document().frame();
- ASSERT(frame);
-
// FIXME: <https://webkit.org/b/164889> Web Inspector: Show Preflight Request information in inspector
// This is only showing success preflight requests and responses but we should show network events
// for preflight failures and distinguish them better from non-preflight requests.
@@ -144,7 +147,10 @@
// FIXME: Ideally, we should ask platformLoadResourceSynchronously to set ResourceResponse isRedirected and use it here.
bool isRedirect = preflightRequest.url().strippedForUseAsReferrer() != response.url().strippedForUseAsReferrer();
if (isRedirect || !response.isSuccessful()) {
- loader.preflightFailure(identifier, ResourceError(errorDomainWebKitInternal, 0, request.url(), ASCIILiteral("Preflight response is not successful"), ResourceError::Type::AccessControl));
+ auto errorMessage = ASCIILiteral("Preflight response is not successful");
+ loader.document().addConsoleMessage(MessageSource::Security, MessageLevel::Error, errorMessage);
+
+ loader.preflightFailure(identifier, ResourceError { errorDomainWebKitInternal, 0, request.url(), errorMessage, ResourceError::Type::AccessControl });
return;
}
diff --git a/Source/WebCore/loader/DocumentThreadableLoader.cpp b/Source/WebCore/loader/DocumentThreadableLoader.cpp
index 4e692e1..a7edc8b 100644
--- a/Source/WebCore/loader/DocumentThreadableLoader.cpp
+++ b/Source/WebCore/loader/DocumentThreadableLoader.cpp
@@ -436,7 +436,10 @@
return;
}
#endif
- logErrorAndFail(error);
+ if (m_shouldLogError == ShouldLogError::Yes)
+ logError(m_document, error, m_options.initiator);
+
+ m_client->didFail(error);
}
void DocumentThreadableLoader::preflightSuccess(ResourceRequest&& request)
@@ -455,8 +458,11 @@
m_preflightChecker = std::nullopt;
InspectorInstrumentation::didFailLoading(m_document.frame(), m_document.frame()->loader().documentLoader(), identifier, error);
- ASSERT(m_client);
- logErrorAndFail(error);
+
+ if (m_shouldLogError == ShouldLogError::Yes)
+ logError(m_document, error, m_options.initiator);
+
+ m_client->didFail(error);
}
void DocumentThreadableLoader::loadRequest(ResourceRequest&& request, SecurityCheckPolicy securityCheck)
@@ -646,8 +652,11 @@
void DocumentThreadableLoader::logErrorAndFail(const ResourceError& error)
{
- if (m_shouldLogError == ShouldLogError::Yes)
+ if (m_shouldLogError == ShouldLogError::Yes) {
+ if (error.isAccessControl() && !error.localizedDescription().isEmpty())
+ m_document.addConsoleMessage(MessageSource::Security, MessageLevel::Error, error.localizedDescription());
logError(m_document, error, m_options.initiator);
+ }
ASSERT(m_client);
m_client->didFail(error);
}
diff --git a/Source/WebCore/loader/ImageLoader.cpp b/Source/WebCore/loader/ImageLoader.cpp
index eef3967..b4d588f 100644
--- a/Source/WebCore/loader/ImageLoader.cpp
+++ b/Source/WebCore/loader/ImageLoader.cpp
@@ -284,13 +284,15 @@
return;
if (m_image->resourceError().isAccessControl()) {
+ URL imageURL = m_image->url();
+
clearImageWithoutConsideringPendingLoadEvent();
m_hasPendingErrorEvent = true;
errorEventSender().dispatchEventSoon(*this);
- static NeverDestroyed<String> consoleMessage(MAKE_STATIC_STRING_IMPL("Cross-origin image load denied by Cross-Origin Resource Sharing policy."));
- element().document().addConsoleMessage(MessageSource::Security, MessageLevel::Error, consoleMessage);
+ auto message = makeString("Cannot load image ", imageURL.string(), " due to access control checks.");
+ element().document().addConsoleMessage(MessageSource::Security, MessageLevel::Error, message);
if (hasPendingDecodePromises())
decodeError("Access control error.");
diff --git a/Source/WebCore/loader/SubresourceLoader.cpp b/Source/WebCore/loader/SubresourceLoader.cpp
index 2d127e8..08d766d 100644
--- a/Source/WebCore/loader/SubresourceLoader.cpp
+++ b/Source/WebCore/loader/SubresourceLoader.cpp
@@ -650,7 +650,7 @@
void SubresourceLoader::didFail(const ResourceError& error)
{
- if (m_frame && m_frame->document() && error.isAccessControl() && options().destination != FetchOptions::Destination::Serviceworker && options().destination != FetchOptions::Destination::EmptyString)
+ if (m_frame && m_frame->document() && error.isAccessControl())
m_frame->document()->addConsoleMessage(MessageSource::Security, MessageLevel::Error, error.localizedDescription());
#if USE(QUICK_LOOK)
diff --git a/Source/WebCore/loader/ThreadableLoader.cpp b/Source/WebCore/loader/ThreadableLoader.cpp
index bc64ebb..ceab6fe 100644
--- a/Source/WebCore/loader/ThreadableLoader.cpp
+++ b/Source/WebCore/loader/ThreadableLoader.cpp
@@ -122,10 +122,6 @@
void ThreadableLoader::logError(ScriptExecutionContext& context, const ResourceError& error, const String& initiator)
{
- // FIXME: extend centralized logging to other clients than fetch, at least XHR and EventSource.
- if (initiator != cachedResourceRequestInitiators().fetch)
- return;
-
if (error.isCancellation())
return;
@@ -139,22 +135,17 @@
return;
const char* messageStart;
- if (initiator == cachedResourceRequestInitiators().fetch)
+ if (initiator == cachedResourceRequestInitiators().eventsource)
+ messageStart = "EventSource cannot load ";
+ else if (initiator == cachedResourceRequestInitiators().fetch)
messageStart = "Fetch API cannot load ";
+ else if (initiator == cachedResourceRequestInitiators().xmlhttprequest)
+ messageStart = "XMLHttpRequest cannot load ";
else
messageStart = "Cannot load ";
- const char* messageMiddle = ". ";
- String description = error.localizedDescription();
- if (description.isEmpty()) {
- // FIXME: We should probably define default description error message for all error types.
- if (error.isAccessControl())
- messageMiddle = ASCIILiteral(" due to access control checks.");
- else
- messageMiddle = ".";
- }
-
- context.addConsoleMessage(MessageSource::JS, MessageLevel::Error, makeString(messageStart, error.failingURL().string(), messageMiddle, description));
+ String messageEnd = error.isAccessControl() ? ASCIILiteral(" due to access control checks.") : ASCIILiteral(".");
+ context.addConsoleMessage(MessageSource::JS, MessageLevel::Error, makeString(messageStart, error.failingURL().string(), messageEnd));
}
} // namespace WebCore
diff --git a/Source/WebCore/loader/cache/CachedResource.cpp b/Source/WebCore/loader/cache/CachedResource.cpp
index b38d6bd..aa54541 100644
--- a/Source/WebCore/loader/cache/CachedResource.cpp
+++ b/Source/WebCore/loader/cache/CachedResource.cpp
@@ -261,7 +261,7 @@
if (m_options.keepAlive) {
if (!cachedResourceLoader.keepaliveRequestTracker().tryRegisterRequest(*this)) {
- setResourceError({ errorDomainWebKitInternal, 0, request.url(), ASCIILiteral("Reached maximum amount of queued data of 64Kb for keepalive requests") });
+ setResourceError({ errorDomainWebKitInternal, 0, request.url(), ASCIILiteral("Reached maximum amount of queued data of 64Kb for keepalive requests"), ResourceError::Type::AccessControl });
failBeforeStarting();
return;
}
diff --git a/Source/WebCore/loader/cache/CachedResourceRequestInitiators.cpp b/Source/WebCore/loader/cache/CachedResourceRequestInitiators.cpp
index b339a8e..dd110c7 100644
--- a/Source/WebCore/loader/cache/CachedResourceRequestInitiators.cpp
+++ b/Source/WebCore/loader/cache/CachedResourceRequestInitiators.cpp
@@ -30,6 +30,7 @@
CachedResourceRequestInitiators::CachedResourceRequestInitiators()
: css("css", AtomicString::ConstructFromLiteral)
+ , eventsource("eventsource", AtomicString::ConstructFromLiteral)
, fetch("fetch", AtomicString::ConstructFromLiteral)
, icon("icon", AtomicString::ConstructFromLiteral)
, xmlhttprequest("xmlhttprequest", AtomicString::ConstructFromLiteral)
diff --git a/Source/WebCore/loader/cache/CachedResourceRequestInitiators.h b/Source/WebCore/loader/cache/CachedResourceRequestInitiators.h
index 50538caf..2a4008f 100644
--- a/Source/WebCore/loader/cache/CachedResourceRequestInitiators.h
+++ b/Source/WebCore/loader/cache/CachedResourceRequestInitiators.h
@@ -34,6 +34,7 @@
CachedResourceRequestInitiators();
const AtomicString css;
+ const AtomicString eventsource;
const AtomicString fetch;
const AtomicString icon;
const AtomicString xmlhttprequest;
diff --git a/Source/WebCore/page/EventSource.cpp b/Source/WebCore/page/EventSource.cpp
index f16ce5f..a6d7129 100644
--- a/Source/WebCore/page/EventSource.cpp
+++ b/Source/WebCore/page/EventSource.cpp
@@ -33,6 +33,7 @@
#include "config.h"
#include "EventSource.h"
+#include "CachedResourceRequestInitiators.h"
#include "ContentSecurityPolicy.h"
#include "EventNames.h"
#include "MessageEvent.h"
@@ -105,6 +106,7 @@
options.cache = FetchOptions::Cache::NoStore;
options.dataBufferingPolicy = DoNotBufferData;
options.contentSecurityPolicyEnforcement = scriptExecutionContext()->shouldBypassMainWorldContentSecurityPolicy() ? ContentSecurityPolicyEnforcement::DoNotEnforce : ContentSecurityPolicyEnforcement::EnforceConnectSrcDirective;
+ options.initiator = cachedResourceRequestInitiators().eventsource;
ASSERT(scriptExecutionContext());
m_loader = ThreadableLoader::create(*scriptExecutionContext(), *this, WTFMove(request), options);
@@ -236,9 +238,6 @@
ASSERT(m_state != CLOSED);
if (error.isAccessControl()) {
- String message = makeString("EventSource cannot load ", error.failingURL().string(), ". ", error.localizedDescription());
- scriptExecutionContext()->addConsoleMessage(MessageSource::JS, MessageLevel::Error, message);
-
abortConnectionAttempt();
return;
}
diff --git a/Source/WebCore/xml/XMLHttpRequest.cpp b/Source/WebCore/xml/XMLHttpRequest.cpp
index 8cea223..19e5ae4 100644
--- a/Source/WebCore/xml/XMLHttpRequest.cpp
+++ b/Source/WebCore/xml/XMLHttpRequest.cpp
@@ -892,15 +892,6 @@
return;
}
- // Network failures are already reported to Web Inspector by ResourceLoader.
- if (error.domain() == errorDomainWebKitInternal) {
- String message = makeString("XMLHttpRequest cannot load ", error.failingURL().string(), ". ", error.localizedDescription());
- logConsoleError(scriptExecutionContext(), message);
- } else if (error.isAccessControl()) {
- String message = makeString("XMLHttpRequest cannot load ", error.failingURL().string(), " due to access control checks.");
- logConsoleError(scriptExecutionContext(), message);
- }
-
// In case didFail is called synchronously on an asynchronous XHR call, let's dispatch network error asynchronously
if (m_async && m_sendFlag && !m_loader) {
m_sendFlag = false;
