Changeset 205464 in webkit


Ignore:
Timestamp:
Sep 5, 2016 7:08:52 PM (8 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r205450.
​https://bugs.webkit.org/show_bug.cgi?id=161614

Made tests flaky, causing false positives on EWS (Requested by
ap on #webkit).

Reverted changeset:

"CachedResourceLoader is not taking into account fetch options
to use or not cached resources"
​https://bugs.webkit.org/show_bug.cgi?id=161389
​http://trac.webkit.org/changeset/205450

Location:
trunk
Files:
17 deleted
53 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r205455 r205464  
     12016-09-05  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r205450.
     4        https://bugs.webkit.org/show_bug.cgi?id=161614
     5
     6        Made tests flaky, causing false positives on EWS (Requested by
     7        ap on #webkit).
     8
     9        Reverted changeset:
     10
     11        "CachedResourceLoader is not taking into account fetch options
     12        to use or not cached resources"
     13        https://bugs.webkit.org/show_bug.cgi?id=161389
     14        http://trac.webkit.org/changeset/205450
     15
    1162016-09-05  Youenn Fablet  <youenn@apple.com>
    217

  • trunk/LayoutTests/http/tests/eventsource/eventsource-cors-basic-expected.txt

    r205450 r205464  
    1 CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
    21CONSOLE 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.
    3 CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
    42CONSOLE 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.
    53Test 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.

  • trunk/LayoutTests/http/tests/eventsource/eventsource-cors-with-credentials-expected.txt

    r205450 r205464  
    1 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    21CONSOLE 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.
    3 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    42CONSOLE 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.
    5 CONSOLE MESSAGE: Credentials flag is true, but Access-Control-Allow-Credentials is not "true".
    63CONSOLE 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".
    74Test 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.

  • trunk/LayoutTests/http/tests/loading/cross-origin-XHR-willLoadRequest-expected.txt

    r205450 r205464  
    44main frame - didHandleOnloadEventsForFrame
    55main frame - didFinishLoadForFrame
    6 CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
    7 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/loading/resources/foo.txt due to access control checks.
     6CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/loading/resources/foo.txt. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
    87The console message above should report failure to load foo.txt due to cross-origin access, not a network error.

  • trunk/LayoutTests/http/tests/resources/download-json-with-delay.php

    r205450 r205464  
    11<?php
    22header("Expires: Thu, 01 Dec 2003 16:00:00 GMT");
    3 
    4 if ($_GET['allowCache']) {
    5     header("Content-Type: application/json");
    6 } else {
    7     header("Content-Type: application/x-no-buffering-please");
    8     header("Cache-Control: no-cache, no-store, must-revalidate");
    9     header("Pragma: no-cache");
    10 }
    11 
    12 if ($_GET['cors']) {
    13     header("Access-Control-Allow-Origin: *");
    14 }
     3header("Cache-Control: no-cache, no-store, must-revalidate");
     4header("Pragma: no-cache");
     5header("Content-Type: application/x-no-buffering-please");
    156
    167$iteration = $_GET['iteration'];

  • trunk/LayoutTests/http/tests/resources/redirect.php

    r205450 r205464  
    11<?php
    2     function addCacheControl($allowCache) {
    3         if ($allowCache)
    4             header("Cache-Control: public, max-age=86400");
    5         else {
    6             # Workaround for https://bugs.webkit.org/show_bug.cgi?id=77538
    7             # Caching redirects results in flakiness in tests that dump loader delegates.
    8             header("Cache-Control: no-store");
    9         }
     2    function addCacheControl() {
     3        # Workaround for https://bugs.webkit.org/show_bug.cgi?id=77538
     4        # Caching redirects results in flakiness in tests that dump loader delegates.
     5        header("Cache-Control: no-store");
    106    }
    117
    128    $url = $_GET['url'];
    139
    14     $allowCache = isset($_GET['allowCache']);
    15 
    1610    if (isset($_GET['refresh'])) {
    1711        header("HTTP/1.1 200");
    1812        header("Refresh: " . $_GET['refresh'] . "; url=$url");
    19         addCacheControl($allowCache);
     13        addCacheControl();
    2014        return;
    2115    }
    … …  
    2923        header("HTTP/1.1 " . $_GET['code']);
    3024    header("Location: $url");
    31     addCacheControl($allowCache);
     25    addCacheControl();
    3226?>

  • trunk/LayoutTests/http/tests/security/img-with-failed-cors-check-fails-to-load-expected.txt

    r205450 r205464  
    1 CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
    21CONSOLE MESSAGE: Cross-origin image load denied by Cross-Origin Resource Sharing policy.
    32ALERT: PASS: The error event was called.

  • trunk/LayoutTests/http/tests/security/resources/abe-allow-star.php

    r205450 r205464  
    11<?php
    22header("Access-Control-Allow-Origin: *");
    3 
    4 $allowCache = $_GET['allowCache'];
    5 if (isset($allowCache))
    6     header("Cache-Control: max-age=100");
    73
    84$name = 'abe.png';

  • trunk/LayoutTests/http/tests/security/video-poster-cross-origin-crash-expected.txt

    r205450 r205464  
    1 CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
    21CONSOLE MESSAGE: Cross-origin image load denied by Cross-Origin Resource Sharing policy.
    32>>>

  • trunk/LayoutTests/http/tests/security/video-poster-cross-origin-crash2-expected.txt

    r205450 r205464  
    1 CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
    21CONSOLE MESSAGE: Cross-origin image load denied by Cross-Origin Resource Sharing policy.
    32Test passes if it doesn't crash.

  • trunk/LayoutTests/http/tests/xmlhttprequest/access-control-and-redirects-async-same-origin-expected.txt

    r205450 r205464  
    1 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    2 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi due to access control checks.
    3 CONSOLE MESSAGE: Credentials flag is true, but Access-Control-Allow-Credentials is not "true".
    4 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow-no-credentials.cgi due to access control checks.
     1CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow-star.cgi. Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
     2CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-basic-allow-no-credentials.cgi. Credentials flag is true, but Access-Control-Allow-Credentials is not "true".
    53Tests that asynchronous XMLHttpRequests handle redirects according to the CORS standard.
    64

  • trunk/LayoutTests/http/tests/xmlhttprequest/access-control-repeated-failed-preflight-crash-expected.txt

    r205450 r205464  
    1 CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
    2 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-basic-denied.cgi due to access control checks.
    3 CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
    4 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-basic-denied.cgi due to access control checks.
    5 CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
    6 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-basic-denied.cgi due to access control checks.
    7 CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
    8 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-basic-denied.cgi due to access control checks.
    9 CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
    10 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-basic-denied.cgi due to access control checks.
    11 CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
    12 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-basic-denied.cgi due to access control checks.
     1CONSOLE 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.
     2CONSOLE 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.
     3CONSOLE 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.
     4CONSOLE 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.
     5CONSOLE 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.
     6CONSOLE 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.
    137PASS

  • trunk/LayoutTests/http/tests/xmlhttprequest/cross-origin-no-authorization-expected.txt

    r205450 r205464  
    11CONSOLE 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".
    2 CONSOLE MESSAGE: Credentials flag is true, but Access-Control-Allow-Credentials is not "true".
    3 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cross-origin-no-authorization.php due to access control checks.
     2CONSOLE MESSAGE: 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".
    43Start
    54Trying different ways to access a password protected resource from another origin. The UA already has login and password for this protection space.

  • trunk/LayoutTests/http/tests/xmlhttprequest/cross-origin-no-credential-prompt-expected.txt

    r205450 r205464  
    1 CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
    2 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/basic-auth/basic-auth.php?uid=41531 due to access control checks.
     1CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/basic-auth/basic-auth.php?uid=41531. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
    32There should be no authentication prompt displayed, since this is a cross-origin request. In automatic mode, the test relies on logging of authentication sheets.

  • trunk/LayoutTests/http/tests/xmlhttprequest/cross-site-denied-response-expected.txt

    r205450 r205464  
    1 CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
    2 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/reply.xml due to access control checks.
     1CONSOLE 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.
    32PASS
    43

  • trunk/LayoutTests/http/tests/xmlhttprequest/onerror-event-expected.txt

    r205450 r205464  
    1 CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
    2 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-basic-denied.cgi due to access control checks.
     1CONSOLE 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.
    32This test that the error event is fired for XMLHttpRequests
    43

  • trunk/LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-https-expected.txt

    r205450 r205464  
    11CONSOLE 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.
    2 CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
    3 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/get.txt due to access control checks.
     2CONSOLE MESSAGE: 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.
    43Tests that origin whitelisting for https does not match http URLs.
    54

  • trunk/LayoutTests/http/tests/xmlhttprequest/origin-whitelisting-ip-addresses-with-subdomains-expected.txt

    r205450 r205464  
    11CONSOLE 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.
    2 CONSOLE MESSAGE: Origin http://localhost:8000 is not allowed by Access-Control-Allow-Origin.
    3 CONSOLE MESSAGE: XMLHttpRequest cannot load http://127.0.0.1:8000/xmlhttprequest/resources/get.txt due to access control checks.
     2CONSOLE MESSAGE: 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.
    43Specifying that an IP address should match subdomains doesn't make sense. This test verifies that it doesn't do anything.
    54

  • trunk/LayoutTests/http/tests/xmlhttprequest/post-blob-content-type-async-expected.txt

    r205450 r205464  
    1 CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
    2 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-allow-lists.php due to access control checks.
     1CONSOLE MESSAGE: 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.
    32Test verifies that content MIME type is set correctly when Blob is sent using XMLHttpRequest asynchronously.
    43

  • trunk/LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-2-expected.txt

    r205450 r205464  
    1 CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
    2 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/reply.xml due to access control checks.
     1CONSOLE 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.
    32Test that a cross-origin redirect to a server that responds is indistinguishable from one that does not. Should say PASS:
    43

  • trunk/LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-expected.txt

    r205450 r205464  
    1 CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
    2 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/reply.xml due to access control checks.
     1CONSOLE 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.
    32Test that a cross-origin redirect to a server that responds is indistinguishable from one that does not. Should say PASS:
    43

  • trunk/LayoutTests/http/tests/xmlhttprequest/simple-cross-origin-denied-events-expected.txt

    r205450 r205464  
    1 CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
    2 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/reply.xml due to access control checks.
     1CONSOLE 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.
    32Test 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:
    43

  • trunk/LayoutTests/http/tests/xmlhttprequest/simple-cross-origin-progress-events-expected.txt

    r205450 r205464  
    1 CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
    2 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/cross-site-progress-events.cgi due to access control checks.
     1CONSOLE 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.
    32CONSOLE 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.
    43Test 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).

  • trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-unsafe-redirect-expected.txt

    r205450 r205464  
    1 CONSOLE MESSAGE: Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
    2 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8080/xmlhttprequest/resources/forbidden.txt due to access control checks.
     1CONSOLE MESSAGE: 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.
    32This tests that unsafe redirects won't be allowed when making an XMLHttpRequest.
    43Sync XHR started.

  • trunk/LayoutTests/imported/w3c/ChangeLog

    r205450 r205464  
     12016-09-05  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r205450.
     4        https://bugs.webkit.org/show_bug.cgi?id=161614
     5
     6        Made tests flaky, causing false positives on EWS (Requested by
     7        ap on #webkit).
     8
     9        Reverted changeset:
     10
     11        "CachedResourceLoader is not taking into account fetch options
     12        to use or not cached resources"
     13        https://bugs.webkit.org/show_bug.cgi?id=161389
     14        http://trac.webkit.org/changeset/205450
     15
    1162016-09-05  Youenn Fablet  <youenn@apple.com>
    217

  • trunk/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/security-consideration.sub-expected.txt

    r205450 r205464  
    1 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    2 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8801/XMLHttpRequest/resources/img.jpg due to access control checks.
     1CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8801/XMLHttpRequest/resources/img.jpg. Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    32
    43FAIL ProgressEvent: security consideration assert_unreached: MUST NOT dispatch progress event. Reached unreachable code

  • trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-basic-expected.txt

    r205450 r205464  
    1 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    2 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    3 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    4 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    5 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    61
    72PASS Same domain different port [no-cors mode]

  • trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-basic-worker-expected.txt

    r205450 r205464  
    1 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    2 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    3 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    4 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    5 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    61
    72PASS Same domain different port [no-cors mode]

  • trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-multiple-origins-expected.txt

    r205450 r205464  
    1 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    21
    32PASS 3 origins allowed, match the 3rd (http://localhost:8800)

  • trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-multiple-origins-worker-expected.txt

    r205450 r205464  
    1 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    21
    32PASS 3 origins allowed, match the 3rd (http://localhost:8800)

  • trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-origin-expected.txt

    r205450 r205464  
    1 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    2 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    3 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    4 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    5 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    6 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    7 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    8 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    91
    102PASS Cross domain different subdomain [origin OK]

  • trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-origin-worker-expected.txt

    r205450 r205464  
    1 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    2 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    3 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    4 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    5 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    6 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    7 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    8 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    91
    102PASS Cross domain different subdomain [origin OK]

  • trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-origin.js

    r205450 r205464  
    1717
    1818  promise_test(function(test) {
    19     return fetch(RESOURCES_DIR + "clean-stash.py?token=" + uuid_token).then(function(resp) {
     19    fetch(RESOURCES_DIR + "clean-stash.py?token=" + uuid_token).then(function(resp) {
    2020      assert_equals(resp.status, 200, "Clean stash response's status is 200");
    2121      if (shouldPass) {

  • trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-redirect-credentials-expected.txt

    r205450 r205464  
    1 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    2 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    3 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    41CONSOLE MESSAGE: Cross-origin redirection to http://localhost:8800/fetch/api/resources/preflight.py?redirect_status=301&location=http%3A%2F%2Fuser%3Apassword%40localhost%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    52CONSOLE MESSAGE: Cross-origin redirection to http://localhost:8800/fetch/api/resources/preflight.py?redirect_status=301&location=http%3A%2F%2Fuser%3A%40localhost%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    … …  
    118CONSOLE MESSAGE: Cross-origin redirection to http://127.0.0.1:8800/fetch/api/resources/preflight.py?redirect_status=301&location=http%3A%2F%2Fuser%3A%40127.0.0.1%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    129CONSOLE MESSAGE: Cross-origin redirection to http://127.0.0.1:8800/fetch/api/resources/preflight.py?redirect_status=301&location=http%3A%2F%2F%3Apassword%40127.0.0.1%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    13 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    14 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    15 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    1610CONSOLE MESSAGE: Cross-origin redirection to http://localhost:8800/fetch/api/resources/preflight.py?redirect_status=302&location=http%3A%2F%2Fuser%3Apassword%40localhost%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    1711CONSOLE MESSAGE: Cross-origin redirection to http://localhost:8800/fetch/api/resources/preflight.py?redirect_status=302&location=http%3A%2F%2Fuser%3A%40localhost%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    … …  
    2317CONSOLE MESSAGE: Cross-origin redirection to http://127.0.0.1:8800/fetch/api/resources/preflight.py?redirect_status=302&location=http%3A%2F%2Fuser%3A%40127.0.0.1%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    2418CONSOLE MESSAGE: Cross-origin redirection to http://127.0.0.1:8800/fetch/api/resources/preflight.py?redirect_status=302&location=http%3A%2F%2F%3Apassword%40127.0.0.1%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    25 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    26 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    27 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    2819CONSOLE MESSAGE: Cross-origin redirection to http://localhost:8800/fetch/api/resources/preflight.py?redirect_status=303&location=http%3A%2F%2Fuser%3Apassword%40localhost%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    2920CONSOLE MESSAGE: Cross-origin redirection to http://localhost:8800/fetch/api/resources/preflight.py?redirect_status=303&location=http%3A%2F%2Fuser%3A%40localhost%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    … …  
    3526CONSOLE MESSAGE: Cross-origin redirection to http://127.0.0.1:8800/fetch/api/resources/preflight.py?redirect_status=303&location=http%3A%2F%2Fuser%3A%40127.0.0.1%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    3627CONSOLE MESSAGE: Cross-origin redirection to http://127.0.0.1:8800/fetch/api/resources/preflight.py?redirect_status=303&location=http%3A%2F%2F%3Apassword%40127.0.0.1%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    37 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    38 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    39 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    4028CONSOLE MESSAGE: Cross-origin redirection to http://localhost:8800/fetch/api/resources/preflight.py?redirect_status=307&location=http%3A%2F%2Fuser%3Apassword%40localhost%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    4129CONSOLE MESSAGE: Cross-origin redirection to http://localhost:8800/fetch/api/resources/preflight.py?redirect_status=307&location=http%3A%2F%2Fuser%3A%40localhost%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    … …  
    4735CONSOLE MESSAGE: Cross-origin redirection to http://127.0.0.1:8800/fetch/api/resources/preflight.py?redirect_status=307&location=http%3A%2F%2Fuser%3A%40127.0.0.1%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    4836CONSOLE MESSAGE: Cross-origin redirection to http://127.0.0.1:8800/fetch/api/resources/preflight.py?redirect_status=307&location=http%3A%2F%2F%3Apassword%40127.0.0.1%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    49 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    50 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    51 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    5237CONSOLE MESSAGE: Cross-origin redirection to http://localhost:8800/fetch/api/resources/preflight.py?redirect_status=308&location=http%3A%2F%2Fuser%3Apassword%40localhost%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    5338CONSOLE MESSAGE: Cross-origin redirection to http://localhost:8800/fetch/api/resources/preflight.py?redirect_status=308&location=http%3A%2F%2Fuser%3A%40localhost%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.

  • trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/cors/cors-redirect-credentials-worker-expected.txt

    r205450 r205464  
    1 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    2 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    3 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    41CONSOLE MESSAGE: Cross-origin redirection to http://localhost:8800/fetch/api/resources/preflight.py?redirect_status=301&location=http%3A%2F%2Fuser%3Apassword%40localhost%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    52CONSOLE MESSAGE: Cross-origin redirection to http://localhost:8800/fetch/api/resources/preflight.py?redirect_status=301&location=http%3A%2F%2Fuser%3A%40localhost%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    … …  
    118CONSOLE MESSAGE: Cross-origin redirection to http://127.0.0.1:8800/fetch/api/resources/preflight.py?redirect_status=301&location=http%3A%2F%2Fuser%3A%40127.0.0.1%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    129CONSOLE MESSAGE: Cross-origin redirection to http://127.0.0.1:8800/fetch/api/resources/preflight.py?redirect_status=301&location=http%3A%2F%2F%3Apassword%40127.0.0.1%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    13 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    14 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    15 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    1610CONSOLE MESSAGE: Cross-origin redirection to http://localhost:8800/fetch/api/resources/preflight.py?redirect_status=302&location=http%3A%2F%2Fuser%3Apassword%40localhost%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    1711CONSOLE MESSAGE: Cross-origin redirection to http://localhost:8800/fetch/api/resources/preflight.py?redirect_status=302&location=http%3A%2F%2Fuser%3A%40localhost%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    … …  
    2317CONSOLE MESSAGE: Cross-origin redirection to http://127.0.0.1:8800/fetch/api/resources/preflight.py?redirect_status=302&location=http%3A%2F%2Fuser%3A%40127.0.0.1%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    2418CONSOLE MESSAGE: Cross-origin redirection to http://127.0.0.1:8800/fetch/api/resources/preflight.py?redirect_status=302&location=http%3A%2F%2F%3Apassword%40127.0.0.1%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    25 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    26 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    27 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    2819CONSOLE MESSAGE: Cross-origin redirection to http://localhost:8800/fetch/api/resources/preflight.py?redirect_status=303&location=http%3A%2F%2Fuser%3Apassword%40localhost%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    2920CONSOLE MESSAGE: Cross-origin redirection to http://localhost:8800/fetch/api/resources/preflight.py?redirect_status=303&location=http%3A%2F%2Fuser%3A%40localhost%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    … …  
    3526CONSOLE MESSAGE: Cross-origin redirection to http://127.0.0.1:8800/fetch/api/resources/preflight.py?redirect_status=303&location=http%3A%2F%2Fuser%3A%40127.0.0.1%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    3627CONSOLE MESSAGE: Cross-origin redirection to http://127.0.0.1:8800/fetch/api/resources/preflight.py?redirect_status=303&location=http%3A%2F%2F%3Apassword%40127.0.0.1%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    37 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    38 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    39 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    4028CONSOLE MESSAGE: Cross-origin redirection to http://localhost:8800/fetch/api/resources/preflight.py?redirect_status=307&location=http%3A%2F%2Fuser%3Apassword%40localhost%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    4129CONSOLE MESSAGE: Cross-origin redirection to http://localhost:8800/fetch/api/resources/preflight.py?redirect_status=307&location=http%3A%2F%2Fuser%3A%40localhost%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    … …  
    4735CONSOLE MESSAGE: Cross-origin redirection to http://127.0.0.1:8800/fetch/api/resources/preflight.py?redirect_status=307&location=http%3A%2F%2Fuser%3A%40127.0.0.1%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    4836CONSOLE MESSAGE: Cross-origin redirection to http://127.0.0.1:8800/fetch/api/resources/preflight.py?redirect_status=307&location=http%3A%2F%2F%3Apassword%40127.0.0.1%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    49 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    50 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    51 CONSOLE MESSAGE: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    5237CONSOLE MESSAGE: Cross-origin redirection to http://localhost:8800/fetch/api/resources/preflight.py?redirect_status=308&location=http%3A%2F%2Fuser%3Apassword%40localhost%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.
    5338CONSOLE MESSAGE: Cross-origin redirection to http://localhost:8800/fetch/api/resources/preflight.py?redirect_status=308&location=http%3A%2F%2Fuser%3A%40localhost%3A8800%2Ffetch%2Fapi%2Fcors%2F..%2Fresources%2Fpreflight.py&count=1 denied by Cross-Origin Resource Sharing policy: Cannot use wildcard in Access-Control-Allow-Origin when credentials flag is true.

  • trunk/LayoutTests/platform/ios-simulator-wk2/imported/w3c/web-platform-tests/fetch/api/cors/cors-basic-expected.txt

    r205450 r205464  
    1 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    2 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    3 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    41
    52PASS Same domain different port [no-cors mode]

  • trunk/LayoutTests/platform/ios-simulator-wk2/imported/w3c/web-platform-tests/fetch/api/cors/cors-basic-worker-expected.txt

    r205450 r205464  
    1 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    2 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    3 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    41
    52PASS Same domain different port [no-cors mode]

  • trunk/LayoutTests/platform/mac-wk2/imported/w3c/web-platform-tests/fetch/api/cors/cors-basic-expected.txt

    r205450 r205464  
    1 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    2 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    3 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    41
    52PASS Same domain different port [no-cors mode]

  • trunk/LayoutTests/platform/mac-wk2/imported/w3c/web-platform-tests/fetch/api/cors/cors-basic-worker-expected.txt

    r205450 r205464  
    1 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    2 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    3 CONSOLE MESSAGE: Origin http://localhost:8800 is not allowed by Access-Control-Allow-Origin.
    41
    52PASS Same domain different port [no-cors mode]

  • trunk/Source/WebCore/ChangeLog

    r205462 r205464  
     12016-09-05  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r205450.
     4        https://bugs.webkit.org/show_bug.cgi?id=161614
     5
     6        Made tests flaky, causing false positives on EWS (Requested by
     7        ap on #webkit).
     8
     9        Reverted changeset:
     10
     11        "CachedResourceLoader is not taking into account fetch options
     12        to use or not cached resources"
     13        https://bugs.webkit.org/show_bug.cgi?id=161389
     14        http://trac.webkit.org/changeset/205450
     15
    1162016-08-31  Filip Pizlo  <fpizlo@apple.com>
    217

  • trunk/Source/WebCore/loader/CrossOriginPreflightChecker.cpp

    r205450 r205464  
    101101void CrossOriginPreflightChecker::startPreflight()
    102102{
    103     ResourceLoaderOptions options;
    104     options.referrerPolicy = m_loader.options().referrerPolicy;
     103    ResourceLoaderOptions options = static_cast<FetchOptions>(m_loader.options());
     104    options.credentials = FetchOptions::Credentials::Omit;
    105105    options.redirect = FetchOptions::Redirect::Manual;
    106106

  • trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp

    r205450 r205464  
    277277    ASSERT(m_client);
    278278
     279    String accessControlErrorDescription;
     280    if (!m_sameOriginRequest && m_options.mode == FetchOptions::Mode::Cors) {
     281        if (!passesAccessControlCheck(response, m_options.allowCredentials, securityOrigin(), accessControlErrorDescription)) {
     282            m_client->didFail(ResourceError(errorDomainWebKitInternal, 0, response.url(), accessControlErrorDescription, ResourceError::Type::AccessControl));
     283            return;
     284        }
     285    }
     286
    279287    ASSERT(response.type() != ResourceResponse::Type::Error);
    280288    if (response.type() == ResourceResponse::Type::Default) {
    … …  
    423431
    424432    ResourceResponse::Tainting tainting = ResourceResponse::Tainting::Basic;
    425     if (!m_sameOriginRequest) {
    426         if (m_options.mode == FetchOptions::Mode::NoCors)
    427             tainting = ResourceResponse::Tainting::Opaque;
    428         else {
    429             ASSERT(m_options.mode == FetchOptions::Mode::Cors);
    430             tainting = ResourceResponse::Tainting::Cors;
    431             String accessControlErrorDescription;
    432             if (!passesAccessControlCheck(response, m_options.allowCredentials, securityOrigin(), accessControlErrorDescription)) {
    433                 m_client->didFail(ResourceError(errorDomainWebKitInternal, 0, response.url(), accessControlErrorDescription, ResourceError::Type::AccessControl));
    434                 return;
    435             }
    436         }
    437     }
     433    if (!m_sameOriginRequest)
     434        tainting = m_options.mode == FetchOptions::Mode::Cors ? ResourceResponse::Tainting::Cors : ResourceResponse::Tainting::Opaque;
    438435    didReceiveResponse(identifier, response, tainting);
    439436

  • trunk/Source/WebCore/loader/ImageLoader.cpp

    r205450 r205464  
    211211        errorEventSender().dispatchEventSoon(*this);
    212212    }
    213 
     213   
    214214    CachedImage* oldImage = m_image.get();
    215215    if (newImage != oldImage) {
    … …  
    283283        return;
    284284
    285     if (resource->resourceError().isAccessControl()) {
     285    if (element().hasAttributeWithoutSynchronization(HTMLNames::crossoriginAttr) && !resource->passesSameOriginPolicyCheck(*element().document().securityOrigin())) {
    286286        clearImageWithoutConsideringPendingLoadEvent();
    287287

  • trunk/Source/WebCore/loader/SubresourceLoader.cpp

    r205450 r205464  
    278278    }
    279279
    280     String errorDescription;
    281     if (!checkResponseCrossOriginAccessControl(response, errorDescription)) {
    282         if (m_frame && m_frame->document())
    283             m_frame->document()->addConsoleMessage(MessageSource::Security, MessageLevel::Error, errorDescription);
    284         cancel(ResourceError(String(), 0, request().url(), errorDescription, ResourceError::Type::AccessControl));
    285         return;
    286     }
    287 
    288280    m_resource->responseReceived(response);
    289281    if (reachedTerminalState())
    … …  
    410402    }
    411403    frame->page()->diagnosticLoggingClient().logDiagnosticMessageWithValue(DiagnosticLoggingKeys::resourceKey(), DiagnosticLoggingKeys::loadedKey(), resourceType, ShouldSample::Yes);
    412 }
    413 
    414 bool SubresourceLoader::checkResponseCrossOriginAccessControl(const ResourceResponse& response, String& errorDescription)
    415 {
    416     if (!m_resource->isCrossOrigin() || options().mode != FetchOptions::Mode::Cors)
    417         return true;
    418 
    419     ASSERT(m_origin);
    420     return passesAccessControlCheck(response, options().allowCredentials, *m_origin, errorDescription);
    421404}
    422405

  • trunk/Source/WebCore/loader/SubresourceLoader.h

    r205450 r205464  
    9393
    9494    bool checkForHTTPStatusCodeError();
    95     bool checkResponseCrossOriginAccessControl(const ResourceResponse&, String&);
    9695    bool checkRedirectionCrossOriginAccessControl(const ResourceRequest& previousRequest, const ResourceResponse&, ResourceRequest& newRequest, String&);
    9796

  • trunk/Source/WebCore/loader/cache/CachedImage.cpp

    r205450 r205464  
    115115}
    116116
    117 void CachedImage::setBodyDataFrom(const CachedResource& resource)
    118 {
    119     ASSERT(resource.type() == type());
    120     const CachedImage& image = static_cast<const CachedImage&>(resource);
    121 
    122     setLoading(false);
    123     m_image = image.m_image;
    124 
    125     if (m_image && is<SVGImage>(*m_image))
    126         m_svgImageCache = std::make_unique<SVGImageCache>(&downcast<SVGImage>(*m_image));
    127 }
    128 
    129117void CachedImage::didAddClient(CachedResourceClient* client)
    130118{
    … …  
    133121        m_image->setData(m_data.copyRef(), true);
    134122    }
    135 
     123   
    136124    ASSERT(client->resourceClientType() == CachedImageClient::expectedType());
    137125    if (m_image && !m_image->isNull())

  • trunk/Source/WebCore/loader/cache/CachedImage.h

    r205450 r205464  
    9292    void clear();
    9393
    94     CachedImage(CachedImage&, const ResourceRequest&, SessionID);
    95 
    96     void setBodyDataFrom(const CachedResource&) final;
    97 
    9894    void createImage();
    9995    void clearImage();

  • trunk/Source/WebCore/loader/cache/CachedResource.cpp

    r205450 r205464  
    237237}
    238238
    239 void CachedResource::addAdditionalRequestHeaders(CachedResourceLoader& loader)
    240 {
    241     addAdditionalRequestHeadersToRequest(m_resourceRequest, loader, *this);
    242 }
    243 
    244 void CachedResource::computeOrigin(CachedResourceLoader& loader)
    245 {
    246     if (type() == MainResource)
    247         return;
    248 
    249     ASSERT(loader.document());
    250     if (m_resourceRequest.hasHTTPOrigin())
    251         m_origin = SecurityOrigin::createFromString(m_resourceRequest.httpOrigin());
    252     else
    253         m_origin = loader.document()->securityOrigin();
    254     ASSERT(m_origin);
    255 
    256     if (!(m_resourceRequest.url().protocolIsData() && m_options.sameOriginDataURLFlag == SameOriginDataURLFlag::Set) && !m_origin->canRequest(m_resourceRequest.url()))
    257         setCrossOrigin();
    258 
    259     addAdditionalRequestHeaders(loader);
     239void CachedResource::addAdditionalRequestHeaders(CachedResourceLoader& cachedResourceLoader)
     240{
     241    addAdditionalRequestHeadersToRequest(m_resourceRequest, cachedResourceLoader, *this);
    260242}
    261243
    … …  
    319301    m_resourceRequest.setPriority(loadPriority());
    320302
    321     computeOrigin(cachedResourceLoader);
     303    if (type() != MainResource) {
     304        if (m_resourceRequest.hasHTTPOrigin())
     305            m_origin = SecurityOrigin::createFromString(m_resourceRequest.httpOrigin());
     306        else
     307            m_origin = cachedResourceLoader.document()->securityOrigin();
     308        ASSERT(m_origin);
     309
     310        if (!(m_resourceRequest.url().protocolIsData() && options.sameOriginDataURLFlag == SameOriginDataURLFlag::Set)  && m_origin && !m_origin->canRequest(m_resourceRequest.url()))
     311            setCrossOrigin();
     312
     313        addAdditionalRequestHeaders(cachedResourceLoader);
     314    }
    322315
    323316    // FIXME: It's unfortunate that the cache layer and below get to know anything about fragment identifiers.
    … …  
    338331
    339332    m_status = Pending;
    340 }
    341 
    342 void CachedResource::loadFrom(const CachedResource& resource, const ResourceLoaderOptions& options, CachedResourceLoader& cachedResourceLoader)
    343 {
    344     ASSERT(url() == resource.url());
    345     ASSERT(type() == resource.type());
    346     ASSERT(resource.status() == Status::Cached);
    347 
    348     m_options = options;
    349     computeOrigin(cachedResourceLoader);
    350 
    351     if (isCrossOrigin() && options.mode == FetchOptions::Mode::Cors) {
    352         ASSERT(m_origin);
    353         String errorMessage;
    354         if (!WebCore::passesAccessControlCheck(resource.response(), m_options.allowCredentials, *m_origin, errorMessage)) {
    355             setResourceError(ResourceError(String(), 0, url(), errorMessage, ResourceError::Type::AccessControl));
    356             return;
    357         }
    358     }
    359 
    360     setBodyDataFrom(resource);
    361333}
    362334

  • trunk/Source/WebCore/loader/cache/CachedResource.h

    r205450 r205464  
    210210    ResourceResponse::Tainting responseTainting() const { return m_responseTainting; }
    211211
    212     void loadFrom(const CachedResource&, const ResourceLoaderOptions&, CachedResourceLoader&);
    213 
    214212    SecurityOrigin* origin() const { return m_origin.get(); }
    215213
    … …  
    308306    virtual void checkNotify();
    309307    virtual bool mayTryReplaceEncodedData() const { return false; }
    310     virtual void setBodyDataFrom(const CachedResource&) { }
    311308
    312309    std::chrono::microseconds freshnessLifetime(const ResourceResponse&) const;
    313310
    314311    void addAdditionalRequestHeaders(CachedResourceLoader&);
    315     void computeOrigin(CachedResourceLoader&);
    316312    void failBeforeStarting();
    317313

  • trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp

    r205450 r205464  
    540540}
    541541
    542 bool CachedResourceLoader::updateCachedResourceWithCurrentRequest(CachedResourceRequest& request, CachedResourceHandle<CachedResource>& resourceHandle)
    543 {
    544     ASSERT(resourceHandle);
    545 
    546     CachedResource& resource = *resourceHandle;
    547 
    548     // FIXME: We should progressively extend this to other reusable resources
    549     if (resource.type() != CachedResource::Type::ImageResource)
    550         return false;
    551 
    552     bool shouldUpdate = resource.options().mode != request.options().mode || request.resourceRequest().httpOrigin() != resource.resourceRequest().httpOrigin();
    553 
    554     if (!shouldUpdate)
    555         return false;
    556 
    557     // FIXME: For being loaded requests, we currently do not use the same resource, as this may induce errors in the resource response tainting.
    558     // We should find a way to improve this.
    559     if (resource.status() != CachedResource::Cached) {
    560         request.setCachingPolicy(CachingPolicy::DisallowCaching);
    561         resourceHandle = loadResource(resource.type(), request);
    562         return true;
    563     }
    564 
    565     resourceHandle = createResource(resource.type(), request.mutableResourceRequest(), request.charset(), sessionID());
    566     resourceHandle->loadFrom(resource, request.options(), *this);
    567     return true;
    568 }
    569 
    570542static inline void logMemoryCacheResourceRequest(Frame* frame, const String& description, const String& value = String())
    571543{
    … …  
    664636        break;
    665637    case Use:
    666         if (!updateCachedResourceWithCurrentRequest(request, resource)) {
    667             if (!shouldContinueAfterNotifyingLoadedFromMemoryCache(request, resource.get()))
    668                 return nullptr;
    669             logMemoryCacheResourceRequest(frame(), DiagnosticLoggingKeys::inMemoryCacheKey(), DiagnosticLoggingKeys::usedKey());
    670             memoryCache.resourceAccessed(*resource);
     638        if (!shouldContinueAfterNotifyingLoadedFromMemoryCache(request, resource.get()))
     639            return nullptr;
     640        logMemoryCacheResourceRequest(frame(), DiagnosticLoggingKeys::inMemoryCacheKey(), DiagnosticLoggingKeys::usedKey());
     641        memoryCache.resourceAccessed(*resource);
    671642#if ENABLE(WEB_TIMING)
    672             if (document() && RuntimeEnabledFeatures::sharedFeatures().resourceTimingEnabled()) {
    673                 // FIXME (161170): The networkLoadTiming shouldn't be stored on the ResourceResponse.
    674                 resource->response().networkLoadTiming().reset();
    675                 loadTiming.setResponseEnd(monotonicallyIncreasingTime());
    676                 m_resourceTimingInfo.storeResourceTimingInitiatorInformation(resource, request, frame());
    677                 m_resourceTimingInfo.addResourceTiming(resource.get(), *document(), loadTiming);
    678             }
    679 #endif
    680         }
     643        if (document() && RuntimeEnabledFeatures::sharedFeatures().resourceTimingEnabled()) {
     644            // FIXME (161170): The networkLoadTiming shouldn't be stored on the ResourceResponse.
     645            resource->response().networkLoadTiming().reset();
     646            loadTiming.setResponseEnd(monotonicallyIncreasingTime());
     647            m_resourceTimingInfo.storeResourceTimingInitiatorInformation(resource, request, frame());
     648            m_resourceTimingInfo.addResourceTiming(resource.get(), *document(), loadTiming);
     649        }
     650#endif
    681651        break;
    682652    }
    … …  
    831801    if (cachedResourceRequest.defer() == CachedResourceRequest::DeferredByClient)
    832802        return Reload;
    833 
     803   
    834804    // Don't reload resources while pasting.
    835805    if (m_allowStaleResources)
    836806        return Use;
    837 
     807   
    838808    // Always use preloads.
    839809    if (existingResource->isPreloaded())

  • trunk/Source/WebCore/loader/cache/CachedResourceLoader.h

    r205450 r205464  
    156156    enum RevalidationPolicy { Use, Revalidate, Reload, Load };
    157157    RevalidationPolicy determineRevalidationPolicy(CachedResource::Type, CachedResourceRequest&, CachedResource* existingResource) const;
    158 
    159     bool updateCachedResourceWithCurrentRequest(CachedResourceRequest&, CachedResourceHandle<CachedResource>&);
     158   
    160159    bool shouldContinueAfterNotifyingLoadedFromMemoryCache(const CachedResourceRequest&, CachedResource*);
    161160    bool checkInsecureContent(CachedResource::Type, const URL&) const;

  • trunk/Source/WebCore/loader/cache/CachedResourceRequest.h

    r205450 r205464  
    6262    const AtomicString& initiatorName() const;
    6363    bool allowsCaching() const { return m_options.cachingPolicy == CachingPolicy::AllowCaching; }
    64     void setCachingPolicy(CachingPolicy policy) { m_options.cachingPolicy = policy; }
    6564
    6665    void setAsPotentiallyCrossOrigin(const String&, Document&);

  • trunk/Source/WebCore/style/StylePendingResources.cpp

    r205450 r205464  
    5555        options.mode = FetchOptions::Mode::Cors;
    5656        options.allowCredentials = DoNotAllowStoredCredentials;
    57         options.sameOriginDataURLFlag = SameOriginDataURLFlag::Set;
    5857    }
    5958
Note: See TracChangeset for help on using the changeset viewer.