Changeset 175841 in webkit


Ignore:
Timestamp:
Nov 10, 2014, 5:16:15 PM (11 years ago)
Author:
ap@apple.com
Message:

http tests should not use shared temporary files
​https://bugs.webkit.org/show_bug.cgi?id=138583

Reviewed by Tim Horton.

Made some of the scripts that write to files take a path argument, and made others
more strictly serve only one test.

This way, we don't race for any files.

  • http/tests/appcache/fail-on-update-2.html:
  • http/tests/appcache/fallback.html:
  • http/tests/appcache/main-resource-fallback-for-network-error-crash.html:
  • http/tests/appcache/main-resource-hash.html:
  • http/tests/appcache/main-resource-redirect.html:
  • http/tests/appcache/multi-fallback.html:
  • http/tests/appcache/non-html.xhtml:
  • http/tests/appcache/offline-access.html:
  • http/tests/appcache/online-whitelist.html:
  • http/tests/appcache/remove-cache.html:
  • http/tests/appcache/resources/counter.php: Removed.
  • http/tests/appcache/resources/fail-on-update-2.php:
  • http/tests/appcache/resources/fail-on-update.php:
  • http/tests/appcache/resources/main-resource-redirect-frame.php:
  • http/tests/appcache/resources/main-resource-redirect.manifest:
  • http/tests/appcache/resources/non-html.manifest:
  • http/tests/appcache/resources/offline-access-frame.html:
  • http/tests/appcache/resources/offline-access.js:
  • http/tests/appcache/resources/offline-access.manifest:
  • http/tests/appcache/resources/online-whitelist.manifest:
  • http/tests/appcache/resources/online-whitelist.php: Copied from LayoutTests/http/tests/appcache/resources/counter.php.
  • http/tests/appcache/resources/remove-cache-frame-2.html:
  • http/tests/appcache/resources/remove-cache-frame.html:
  • http/tests/appcache/resources/remove-cache.php: Copied from LayoutTests/http/tests/appcache/resources/fail-on-update.php.
  • http/tests/appcache/resources/update-cache.php: Copied from LayoutTests/http/tests/appcache/resources/versioned-manifest.php.
  • http/tests/appcache/resources/versioned-manifest.php: Removed.
  • http/tests/appcache/update-cache.html:
  • http/tests/cache/network-error-during-revalidation.html:
  • http/tests/cache/post-redirect-get.php:
  • http/tests/cache/post-with-cached-subresources.php:
  • http/tests/cache/reload-main-resource.php:
  • http/tests/cache/resources/network-error-during-revalidation-frame.html:
  • http/tests/cache/resources/partitioned-cache-echo-state.php:
  • http/tests/cache/resources/partitioned-cache-loader.html:
  • http/tests/cache/resources/post-image-to-verify.php:
  • http/tests/cache/resources/reload-main-resource-iframe.php:
  • http/tests/cache/stopped-revalidation.html:
  • http/tests/cache/subresource-fragment-identifier.html:
  • http/tests/css/border-image-loading.html:
  • http/tests/css/css-image-loading.html:
  • http/tests/css/mask-image-loading.html:
  • http/tests/css/reflection-mask-image-loading.html:
  • http/tests/css/resources/request-logging.js:
  • http/tests/loading/preload-img-test.html:
  • http/tests/local/link-stylesheet-load-order-preload.html:
  • http/tests/local/link-stylesheet-load-order.html:
  • http/tests/misc/link-rel-prefetch-and-subresource.html:
  • http/tests/resources/network-simulator.php:
  • http/tests/resources/tripmine.php: Removed.
  • http/tests/xmlhttprequest/access-control-preflight-async-header-denied-expected.txt:
  • http/tests/xmlhttprequest/access-control-preflight-async-header-denied.html:
  • http/tests/xmlhttprequest/access-control-preflight-async-method-denied-expected.txt:
  • http/tests/xmlhttprequest/access-control-preflight-async-method-denied.html:
  • http/tests/xmlhttprequest/access-control-preflight-async-not-supported-expected.txt:
  • http/tests/xmlhttprequest/access-control-preflight-async-not-supported.html:
  • http/tests/xmlhttprequest/access-control-preflight-headers-async.html:
  • http/tests/xmlhttprequest/access-control-preflight-headers-sync.html:
  • http/tests/xmlhttprequest/access-control-preflight-sync-header-denied-expected.txt:
  • http/tests/xmlhttprequest/access-control-preflight-sync-header-denied.html:
  • http/tests/xmlhttprequest/access-control-preflight-sync-method-denied-expected.txt:
  • http/tests/xmlhttprequest/access-control-preflight-sync-method-denied.html:
  • http/tests/xmlhttprequest/access-control-preflight-sync-not-supported-expected.txt:
  • http/tests/xmlhttprequest/access-control-preflight-sync-not-supported.html:
  • http/tests/xmlhttprequest/redirect-cross-origin-tripmine.html:
  • http/tests/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php:
  • http/tests/xmlhttprequest/resources/no-custom-header.php:
  • http/tests/xmlhttprequest/resources/redirect-cross-origin-tripmine.php: Copied from LayoutTests/http/tests/resources/tripmine.php.
  • http/tests/xmlhttprequest/state-after-network-error.html:
  • http/tests/xmlhttprequest/xmlhttprequest-responseURL-expected.txt:
  • http/tests/xmlhttprequest/xmlhttprequest-responseURL.html:
Location:
trunk/LayoutTests
Files:
64 edited
1 copied
3 moved

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r175834 r175841  
     12014-11-10  Alexey Proskuryakov  <ap@apple.com>
     2
     3        http tests should not use shared temporary files
     4        https://bugs.webkit.org/show_bug.cgi?id=138583
     5
     6        Reviewed by Tim Horton.
     7
     8        Made some of the scripts that write to files take a path argument, and made others
     9        more strictly serve only one test.
     10
     11        This way, we don't race for any files.
     12
     13        * http/tests/appcache/fail-on-update-2.html:
     14        * http/tests/appcache/fallback.html:
     15        * http/tests/appcache/main-resource-fallback-for-network-error-crash.html:
     16        * http/tests/appcache/main-resource-hash.html:
     17        * http/tests/appcache/main-resource-redirect.html:
     18        * http/tests/appcache/multi-fallback.html:
     19        * http/tests/appcache/non-html.xhtml:
     20        * http/tests/appcache/offline-access.html:
     21        * http/tests/appcache/online-whitelist.html:
     22        * http/tests/appcache/remove-cache.html:
     23        * http/tests/appcache/resources/counter.php: Removed.
     24        * http/tests/appcache/resources/fail-on-update-2.php:
     25        * http/tests/appcache/resources/fail-on-update.php:
     26        * http/tests/appcache/resources/main-resource-redirect-frame.php:
     27        * http/tests/appcache/resources/main-resource-redirect.manifest:
     28        * http/tests/appcache/resources/non-html.manifest:
     29        * http/tests/appcache/resources/offline-access-frame.html:
     30        * http/tests/appcache/resources/offline-access.js:
     31        * http/tests/appcache/resources/offline-access.manifest:
     32        * http/tests/appcache/resources/online-whitelist.manifest:
     33        * http/tests/appcache/resources/online-whitelist.php: Copied from LayoutTests/http/tests/appcache/resources/counter.php.
     34        * http/tests/appcache/resources/remove-cache-frame-2.html:
     35        * http/tests/appcache/resources/remove-cache-frame.html:
     36        * http/tests/appcache/resources/remove-cache.php: Copied from LayoutTests/http/tests/appcache/resources/fail-on-update.php.
     37        * http/tests/appcache/resources/update-cache.php: Copied from LayoutTests/http/tests/appcache/resources/versioned-manifest.php.
     38        * http/tests/appcache/resources/versioned-manifest.php: Removed.
     39        * http/tests/appcache/update-cache.html:
     40        * http/tests/cache/network-error-during-revalidation.html:
     41        * http/tests/cache/post-redirect-get.php:
     42        * http/tests/cache/post-with-cached-subresources.php:
     43        * http/tests/cache/reload-main-resource.php:
     44        * http/tests/cache/resources/network-error-during-revalidation-frame.html:
     45        * http/tests/cache/resources/partitioned-cache-echo-state.php:
     46        * http/tests/cache/resources/partitioned-cache-loader.html:
     47        * http/tests/cache/resources/post-image-to-verify.php:
     48        * http/tests/cache/resources/reload-main-resource-iframe.php:
     49        * http/tests/cache/stopped-revalidation.html:
     50        * http/tests/cache/subresource-fragment-identifier.html:
     51        * http/tests/css/border-image-loading.html:
     52        * http/tests/css/css-image-loading.html:
     53        * http/tests/css/mask-image-loading.html:
     54        * http/tests/css/reflection-mask-image-loading.html:
     55        * http/tests/css/resources/request-logging.js:
     56        * http/tests/loading/preload-img-test.html:
     57        * http/tests/local/link-stylesheet-load-order-preload.html:
     58        * http/tests/local/link-stylesheet-load-order.html:
     59        * http/tests/misc/link-rel-prefetch-and-subresource.html:
     60        * http/tests/resources/network-simulator.php:
     61        * http/tests/resources/tripmine.php: Removed.
     62        * http/tests/xmlhttprequest/access-control-preflight-async-header-denied-expected.txt:
     63        * http/tests/xmlhttprequest/access-control-preflight-async-header-denied.html:
     64        * http/tests/xmlhttprequest/access-control-preflight-async-method-denied-expected.txt:
     65        * http/tests/xmlhttprequest/access-control-preflight-async-method-denied.html:
     66        * http/tests/xmlhttprequest/access-control-preflight-async-not-supported-expected.txt:
     67        * http/tests/xmlhttprequest/access-control-preflight-async-not-supported.html:
     68        * http/tests/xmlhttprequest/access-control-preflight-headers-async.html:
     69        * http/tests/xmlhttprequest/access-control-preflight-headers-sync.html:
     70        * http/tests/xmlhttprequest/access-control-preflight-sync-header-denied-expected.txt:
     71        * http/tests/xmlhttprequest/access-control-preflight-sync-header-denied.html:
     72        * http/tests/xmlhttprequest/access-control-preflight-sync-method-denied-expected.txt:
     73        * http/tests/xmlhttprequest/access-control-preflight-sync-method-denied.html:
     74        * http/tests/xmlhttprequest/access-control-preflight-sync-not-supported-expected.txt:
     75        * http/tests/xmlhttprequest/access-control-preflight-sync-not-supported.html:
     76        * http/tests/xmlhttprequest/redirect-cross-origin-tripmine.html:
     77        * http/tests/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php:
     78        * http/tests/xmlhttprequest/resources/no-custom-header.php:
     79        * http/tests/xmlhttprequest/resources/redirect-cross-origin-tripmine.php: Copied from LayoutTests/http/tests/resources/tripmine.php.
     80        * http/tests/xmlhttprequest/state-after-network-error.html:
     81        * http/tests/xmlhttprequest/xmlhttprequest-responseURL-expected.txt:
     82        * http/tests/xmlhttprequest/xmlhttprequest-responseURL.html:
     83
    1842014-11-10  Michael Saboff  <msaboff@apple.com>
    285

  • trunk/LayoutTests/http/tests/appcache/fail-on-update-2.html

    r120167 r175841  
    99{
    1010    var req = new XMLHttpRequest;
    11     req.open("GET", "resources/fail-on-update.php?command=" + (state ? "delete" : "reset"), false);
     11    req.open("GET", "resources/fail-on-update-2.php?command=" + (state ? "delete" : "reset"), false);
    1212    req.send(null);
    1313}

  • trunk/LayoutTests/http/tests/appcache/fallback.html

    r120167 r175841  
    2222    try {
    2323        var req = new XMLHttpRequest;
    24         req.open("GET", "/resources/network-simulator.php?command=" + (state ? "connect" : "disconnect"), false);
     24        req.open("GET", "/resources/network-simulator.php?test=appcache-fallback&command=" + (state ? "connect" : "disconnect"), false);
    2525        req.send("");
    2626    } catch (ex) {
    … …  
    4444}
    4545
    46 var testURL = "/resources/network-simulator.php?path=/appcache/resources/not-in-cache.txt";
     46var testURL = "/resources/network-simulator.php?test=appcache-fallback&path=/appcache/resources/not-in-cache.txt";
    4747var nonexistentURL = "resources/does-not-exist";
    4848var redirectURL = "resources/fallback-redirect.php";

  • trunk/LayoutTests/http/tests/appcache/main-resource-fallback-for-network-error-crash.html

    r151099 r175841  
    66</div>
    77
    8 <a id= "Link" href="/resources/network-simulator.php?path=does-not-exist" > click this link when the server is down or the client device doesn't have a data connection, this will verify if the fallback will cause the crash. </a>
     8<a id= "Link" href="/resources/network-simulator.php?test=appcache-main-resource-fallback-for-network-error-crash&path=does-not-exist" > click this link when the server is down or the client device doesn't have a data connection, this will verify if the fallback will cause the crash. </a>
    99
    1010
    … …  
    1414{
    1515    var req = new XMLHttpRequest;
    16     req.open("GET", "/resources/network-simulator.php?command=" + (state ? "connect" : "disconnect"), false);
     16    req.open("GET", "/resources/network-simulator.php?test=appcache-main-resource-fallback-for-network-error-crash&command=" + (state ? "connect" : "disconnect"), false);
    1717    req.send("");
    1818}
    … …  
    2727    if (window.testRunner) {
    2828        setNetworkEnabled(false);
    29         window.location="/resources/network-simulator.php?path=does-not-exist";
     29        window.location="/resources/network-simulator.php?test=appcache-main-resource-fallback-for-network-error-crash&path=does-not-exist";
    3030    }
    3131}

  • trunk/LayoutTests/http/tests/appcache/main-resource-hash.html

    r120167 r175841  
    1919{
    2020    var req = new XMLHttpRequest;
    21     req.open("GET", "/resources/network-simulator.php?command=" + (state ? "connect" : "disconnect"), false);
     21    req.open("GET", "/resources/network-simulator.php?test=appcache-main-resource-main-resource-hash&command=" + (state ? "connect" : "disconnect"), false);
    2222    req.send("");
    2323}
    … …  
    2929        setNetworkEnabled(false);
    3030        var ifr = document.createElement("iframe");
    31         ifr.setAttribute("src", "/resources/network-simulator.php?path=/appcache/resources/main-resource-hash-frame.html#bar");
     31        ifr.setAttribute("src", "/resources/network-simulator.php?test=appcache-main-resource-main-resource-hash&path=/appcache/resources/main-resource-hash-frame.html#bar");
    3232        document.body.appendChild(ifr);
    3333    } else {
    … …  
    4444setNetworkEnabled(true);
    4545var ifr = document.createElement("iframe");
    46 ifr.setAttribute("src", "/resources/network-simulator.php?path=/appcache/resources/main-resource-hash-frame.html#foo");
     46ifr.setAttribute("src", "/resources/network-simulator.php?test=appcache-main-resource-main-resource-hash&path=/appcache/resources/main-resource-hash-frame.html#foo");
    4747document.body.appendChild(ifr);
    4848

  • trunk/LayoutTests/http/tests/appcache/main-resource-redirect.html

    r120167 r175841  
    1212{
    1313    var req = new XMLHttpRequest;
    14     req.open("GET", "/resources/network-simulator.php?command=" + (state ? "connect" : "disconnect"), false);
     14    req.open("GET", "/resources/network-simulator.php?test=appcache-main-resource-main-resource-redirect&command=" + (state ? "connect" : "disconnect"), false);
    1515    req.send("");
    1616}

  • trunk/LayoutTests/http/tests/appcache/multi-fallback.html

    r127922 r175841  
    2222    try {
    2323        var req = new XMLHttpRequest;
    24         req.open("GET", "/resources/network-simulator.php?command=" + (state ? "connect" : "disconnect"), false);
     24        req.open("GET", "/resources/network-simulator.php?test=appcache-multi-fallback&command=" + (state ? "connect" : "disconnect"), false);
    2525        req.send("");
    2626    } catch (ex) {

  • trunk/LayoutTests/http/tests/appcache/non-html.xhtml

    r120167 r175841  
    11<html xmlns="http://www.w3.org/1999/xhtml"
    2       manifest="/resources/network-simulator.php?path=/appcache/resources/non-html.manifest">
     2      manifest="/resources/network-simulator.php?test=appcache-non-html&amp;path=/appcache/resources/non-html.manifest">
    33<head><title/></head>
    44<body>
    … …  
    2020{
    2121    var req = new XMLHttpRequest;
    22     req.open("GET", "/resources/network-simulator.php?command=" + (state ? "connect" : "disconnect"), false);
     22    req.open("GET", "/resources/network-simulator.php?test=appcache-non-html&amp;command=" + (state ? "connect" : "disconnect"), false);
    2323    req.send("");
    2424}
    … …  
    2727{
    2828    var ifr = document.createElement("iframe");
    29     ifr.setAttribute("src", "/resources/network-simulator.php?path=/appcache/resources/abe.png");
     29    ifr.setAttribute("src", "/resources/network-simulator.php?test=appcache-non-html&amp;path=/appcache/resources/abe.png");
    3030    ifr.onload = frameCreated;
    3131    document.body.appendChild(ifr);
    … …  
    4444    try {
    4545        var req = new XMLHttpRequest();
    46         req.open("GET", "/resources/network-simulator.php?path=/appcache/resources/not-in-cache.txt", false);
     46        req.open("GET", "/resources/network-simulator.php?test=appcache-non-html&amp;path=/appcache/resources/not-in-cache.txt", false);
    4747        req.send();
    4848    } catch (e) {
    … …  
    5959    try {
    6060        var req = new XMLHttpRequest();
    61         req.open("GET", "/resources/network-simulator.php?path=/appcache/resources/simple.txt", false);
     61        req.open("GET", "/resources/network-simulator.php?test=appcache-non-html&amp;path=/appcache/resources/simple.txt", false);
    6262        req.send();
    6363    } catch (e) {

  • trunk/LayoutTests/http/tests/appcache/offline-access.html

    r120167 r175841  
    1919{
    2020    var req = new XMLHttpRequest;
    21     req.open("GET", "/resources/network-simulator.php?command=" + (state ? "connect" : "disconnect"), false);
     21    req.open("GET", "/resources/network-simulator.php?test=appcache-offline-access&command=" + (state ? "connect" : "disconnect"), false);
    2222    req.send("");
    2323}
    … …  
    2626{
    2727    var ifr = document.createElement("iframe");
    28     ifr.setAttribute("src", "/resources/network-simulator.php?path=/appcache/resources/offline-access-frame.html");
     28    ifr.setAttribute("src", "/resources/network-simulator.php?test=appcache-offline-access&path=/appcache/resources/offline-access-frame.html");
    2929    document.body.appendChild(ifr);
    3030}

  • trunk/LayoutTests/http/tests/appcache/online-whitelist.html

    r120167 r175841  
    4444function test()
    4545{
    46     if (load("resources/counter.php?cached") != load("resources/counter.php?cached")) {
     46    if (load("resources/online-whitelist.php?cached") != load("resources/online-whitelist.php?cached")) {
    4747        log("FAIL: Explicit entry didn't override online whitelist.");
    4848        hadError = true;
    4949    }
    5050
    51     if (load("resources/counter.php?uncached") == load("resources/counter.php?uncached")) {
     51    if (load("resources/online-whitelist.php?uncached") == load("resources/online-whitelist.php?uncached")) {
    5252        log("FAIL: Online whitelist resource wasn't reloaded from network.");
    5353        hadError = true;
    5454    }
    5555
    56     if (load("resources/counter.php?uncachedxxx") == load("resources/counter.php?uncachedxxx")) {
     56    if (load("resources/online-whitelist.php?uncachedxxx") == load("resources/online-whitelist.php?uncachedxxx")) {
    5757        log("FAIL: Online whitelist resource wasn't reloaded from network (prefix matching).");
    5858        hadError = true;
    5959    }
    6060
    61     if (canLoad("resources/counter.php?foobar")) {
     61    if (canLoad("resources/online-whitelist.php?foobar")) {
    6262        log("FAIL: Uncached resource was successfully loaded.");
    6363        hadError = true;

  • trunk/LayoutTests/http/tests/appcache/remove-cache.html

    r120167 r175841  
    1 <html manifest="resources/fail-on-update.php">
     1<html manifest="resources/remove-cache.php">
    22<p>Test that a 404 response for manifest results in cache removal.</p>
    33<body>
    … …  
    2525{
    2626    var req = new XMLHttpRequest;
    27     req.open("GET", "resources/fail-on-update.php?command=" + (state ? "delete" : "reset"), false);
     27    req.open("GET", "resources/remove-cache.php?command=" + (state ? "delete" : "reset"), false);
    2828    req.send(null);
    2929}

  • trunk/LayoutTests/http/tests/appcache/resources/fail-on-update-2.php

    r69048 r175841  
    22require_once '../../resources/portabilityLayer.php';
    33
    4 $tmpFile = sys_get_temp_dir() . "/" . "fail_on_update_state";
     4# This script may only be used by appcache/fail-on-update-2.html test, since it uses global data.
     5$tmpFile = sys_get_temp_dir() . "/" . "appcache_fail-on-update-2_state";
    56
    67function setState($newState, $file)
    … …  
    3334    print("fail-on-update-2.html\n");
    3435    print("NETWORK:\n");
    35     print("fail-on-update.php?command=\n");
     36    print("fail-on-update-2.php?command=\n");
    3637} else if ($state == "Deleted") {
    3738    header('HTTP/1.0 404 Not Found');

  • trunk/LayoutTests/http/tests/appcache/resources/fail-on-update.php

    r40032 r175841  
    22require_once '../../resources/portabilityLayer.php';
    33
    4 $tmpFile = sys_get_temp_dir() . "/" . "fail_on_update_state";
     4# This script may only be used by appcache/fail-on-update.html test, since it uses global data.
     5$tmpFile = sys_get_temp_dir() . "/" . "appcache_fail-on-update_state";
    56
    67function setState($newState, $file)

  • trunk/LayoutTests/http/tests/appcache/resources/main-resource-redirect-frame.php

    r69226 r175841  
    11<?php
    22  header('HTTP/1.0 302 Found');
    3   header('Location: http://127.0.0.1:8000/resources/network-simulator.php?path=/appcache/resources/main-resource-redirect-frame-2.html');
     3  header('Location: http://127.0.0.1:8000/resources/network-simulator.php?test=appcache-main-resource-main-resource-redirect&path=/appcache/resources/main-resource-redirect-frame-2.html');
    44?>

  • trunk/LayoutTests/http/tests/appcache/resources/main-resource-redirect.manifest

    r69226 r175841  
    11CACHE MANIFEST
    2 http://127.0.0.1:8000/resources/network-simulator.php?path=/appcache/resources/main-resource-redirect-frame-2.html
     2http://127.0.0.1:8000/resources/network-simulator.php?test=appcache-main-resource-main-resource-redirect&path=/appcache/resources/main-resource-redirect-frame-2.html
    33NETWORK:
    4 http://127.0.0.1:8000/resources/network-simulator.php?command
     4http://127.0.0.1:8000/resources/network-simulator.php?test=appcache-main-resource-main-resource-redirect&command

  • trunk/LayoutTests/http/tests/appcache/resources/non-html.manifest

    r40401 r175841  
    11CACHE MANIFEST
    22/appcache/non-html.xhtml
    3 /resources/network-simulator.php?path=/appcache/resources/simple.txt
    4 /resources/network-simulator.php?path=/appcache/resources/abe.png
    5 /resources/network-simulator.php?path=/appcache/resources/non-html.manifest
     3/resources/network-simulator.php?test=appcache-non-html&path=/appcache/resources/simple.txt
     4/resources/network-simulator.php?test=appcache-non-html&path=/appcache/resources/abe.png
     5/resources/network-simulator.php?test=appcache-non-html&path=/appcache/resources/non-html.manifest
    66NETWORK:
    77/favicon.ico
    8 /resources/network-simulator.php?command=
     8/resources/network-simulator.php?test=appcache-non-html&command=

  • trunk/LayoutTests/http/tests/appcache/resources/offline-access-frame.html

    r71196 r175841  
    1 <html manifest="/resources/network-simulator.php?path=/appcache/resources/offline-access.manifest">
     1<html manifest="/resources/network-simulator.php?test=appcache-offline-access&path=/appcache/resources/offline-access.manifest">
    22<div id=result></div>
    33<script>
    … …  
    1212applicationCache.onobsolete = function() { log("obsolete") }
    1313</script>
    14 <script src="/resources/network-simulator.php?path=/appcache/resources/offline-access.js"></script>
     14<script src="/resources/network-simulator.php?test=appcache-offline-access&path=/appcache/resources/offline-access.js"></script>
    1515<script>
    1616

  • trunk/LayoutTests/http/tests/appcache/resources/offline-access.js

    r39491 r175841  
    77    try {
    88        var req = new XMLHttpRequest;
    9         req.open("GET", "/resources/network-simulator.php?path=/appcache/resources/simple.txt", false);
     9        req.open("GET", "/resources/network-simulator.php?test=appcache-offline-access&path=/appcache/resources/simple.txt", false);
    1010        req.send(null);
    1111        if (req.responseText == "Hello, World!")

  • trunk/LayoutTests/http/tests/appcache/resources/offline-access.manifest

    r39491 r175841  
    11CACHE MANIFEST
    2 /resources/network-simulator.php?path=/appcache/resources/offline-access-frame.html
    3 /resources/network-simulator.php?path=/appcache/resources/offline-access.manifest
    4 /resources/network-simulator.php?path=/appcache/resources/simple.txt
    5 /resources/network-simulator.php?path=/appcache/resources/offline-access.js
     2/resources/network-simulator.php?test=appcache-offline-access&path=/appcache/resources/offline-access-frame.html
     3/resources/network-simulator.php?test=appcache-offline-access&path=/appcache/resources/offline-access.manifest
     4/resources/network-simulator.php?test=appcache-offline-access&path=/appcache/resources/simple.txt
     5/resources/network-simulator.php?test=appcache-offline-access&path=/appcache/resources/offline-access.js

  • trunk/LayoutTests/http/tests/appcache/resources/online-whitelist.manifest

    r39548 r175841  
    11CACHE MANIFEST
    2 counter.php?cached
     2online-whitelist.php?cached
    33
    44NETWORK:
    … …  
    99
    1010# This should be ignored, because explicit entries are checked before online whitelist
    11 counter.php?cached
     11online-whitelist.php?cached
    1212
    1313# This should work normally.
    14 counter.php?uncached
     14online-whitelist.php?uncached

  • trunk/LayoutTests/http/tests/appcache/resources/online-whitelist.php

    r175731 r175841  
    22require_once '../../resources/portabilityLayer.php';
    33
    4 $tmpFile = sys_get_temp_dir() . "/" . "appcache_counter";
     4# This script may only be used by appcache/online-whitelist.html test, since it uses global data.
     5$tmpFile = sys_get_temp_dir() . "/" . "appcache_online-whitelist_state";
    56
    67function stepCounter($file)

  • trunk/LayoutTests/http/tests/appcache/resources/remove-cache-frame-2.html

    r40354 r175841  
    1 <html manifest="fail-on-update.php">
     1<html manifest="remove-cache.php">
    22<body>
    33<div id=result></div>

  • trunk/LayoutTests/http/tests/appcache/resources/remove-cache-frame.html

    r40354 r175841  
    1 <html manifest="fail-on-update.php">
     1<html manifest="remove-cache.php">
    22<body>
    33<div id=result></div>

  • trunk/LayoutTests/http/tests/appcache/resources/remove-cache.php

    r175731 r175841  
    22require_once '../../resources/portabilityLayer.php';
    33
    4 $tmpFile = sys_get_temp_dir() . "/" . "fail_on_update_state";
     4# This script may only be used by appcache/remove-cache.html test, since it uses global data.
     5$tmpFile = sys_get_temp_dir() . "/" . "appcache_remove-cache_state";
    56
    67function setState($newState, $file)
    … …  
    3233    print("CACHE MANIFEST\n");
    3334    print("NETWORK:\n");
    34     print("fail-on-update.php?command=\n");
     35    print("remove-cache.php?command=\n");
    3536} else if ($state == "Deleted") {
    3637    header('HTTP/1.0 404 Not Found');

  • trunk/LayoutTests/http/tests/appcache/resources/update-cache.php

    r175731 r175841  
    22require_once '../../resources/portabilityLayer.php';
    33
    4 $tmpFile = sys_get_temp_dir() . "/" . "appcache_manifest_counter";
     4# This script may only be used by appcache/update-cache.html test, since it uses global data.
     5$tmpFile = sys_get_temp_dir() . "/" . "appcache_update-cache_state";
    56
    67function getCount($file)
    … …  
    3132print("CACHE MANIFEST\n");
    3233print("# version " . getCount($tmpFile) . "\n");
    33 print("counter.php\n");
    3434print("uncacheable-resource.php\n"); // with Cache-control: no-store
    3535print("NETWORK:\n");
    36 print("versioned-manifest.php?command=\n");
     36print("update-cache.php?command=\n");
    3737?>

  • trunk/LayoutTests/http/tests/appcache/update-cache.html

    r120167 r175841  
    1 <html manifest="resources/versioned-manifest.php">
     1<html manifest="resources/update-cache.php">
    22<body>
    33<p>Test a simple offline application self-update process. Should print a series of messages followed with DONE:</p>
    … …  
    1818{
    1919    var req = new XMLHttpRequest;
    20     req.open("GET", "resources/versioned-manifest.php?command=step", false);
     20    req.open("GET", "resources/update-cache.php?command=step", false);
    2121    req.send(false);
    2222}

  • trunk/LayoutTests/http/tests/cache/network-error-during-revalidation.html

    r139230 r175841  
    1717    log(state ? "Enabling network" : "Disabling network");
    1818    var req = new XMLHttpRequest;
    19     req.open("GET", "/resources/network-simulator.php?command=" + (state ? "connect" : "disconnect"), false);
     19    req.open("GET", "/resources/network-simulator.php?test=cache-network-error-during-revalidation&command=" + (state ? "connect" : "disconnect"), false);
    2020    req.send("");
    2121}

  • trunk/LayoutTests/http/tests/cache/post-redirect-get.php

    r120167 r175841  
    3131    document.getElementById("result").appendChild(document.createTextNode(message));
    3232    var xhr = new XMLHttpRequest;
    33     xhr.open("GET", "../resources/reset-temp-file.php?filename=post.tmp", false);
     33    xhr.open("GET", "../resources/reset-temp-file.php?filename=cache_post-redirect-get_state", false);
    3434    xhr.send(null);
    3535    if (window.testRunner)
    … …  
    4242    // The initial load of the image might have been done from the cache. In that case, touch the
    4343    // state file to indicate a load has already occurred.
    44     if (!file_exists(sys_get_temp_dir() . "/post.tmp")) {
     44    if (!file_exists(sys_get_temp_dir() . "/cache_post-redirect-get_state")) {
    4545        echo "<script>";
    4646        echo "xhr = new XMLHttpRequest;";
    47         echo "xhr.open('GET', '../resources/touch-temp-file.php?filename=post.tmp', false);";
     47        echo "xhr.open('GET', '../resources/touch-temp-file.php?filename=cache_post-redirect-get_state', false);";
    4848        echo "xhr.send(null);";
    4949        echo "</script>";
    5050    }
    51     echo "<img src='resources/post-image-to-verify.php' onload=\"logAndFinish('PASS');\" onerror=\"logAndFinish('FAIL');\"></img>";
     51    echo "<img src='resources/post-image-to-verify.php?test=cache_post-redirect-get' onload=\"logAndFinish('PASS');\" onerror=\"logAndFinish('FAIL');\"></img>";
    5252} else {
    5353    echo "<form action='post-redirect-get.php' method='post'>";
    5454    echo "<input type='submit' id='submit' name='submit' value='redirect'>";
    5555    echo "</form>";
    56     echo "<img src='resources/post-image-to-verify.php' onload=\"document.getElementById('submit').click();\" onerror=\"logAndFinish('FAIL on initial load');\"></img>";
     56    echo "<img src='resources/post-image-to-verify.php?test=cache_post-redirect-get' onload=\"document.getElementById('submit').click();\" onerror=\"logAndFinish('FAIL on initial load');\"></img>";
    5757}
    5858?>

  • trunk/LayoutTests/http/tests/cache/post-with-cached-subresources.php

    r120167 r175841  
    2525    document.getElementById("result").appendChild(document.createTextNode(message));
    2626    var xhr = new XMLHttpRequest;
    27     xhr.open("GET", "../resources/reset-temp-file.php?filename=post.tmp", false);
     27    xhr.open("GET", "../resources/reset-temp-file.php?filename=cache_post-with-cached-subresources_state", false);
    2828    xhr.send(null);
    2929    if (window.testRunner)
    … …  
    3636    // The initial load of the image might have been done from the cache. In that case, touch the
    3737    // state file to indicate a load has already occurred.
    38     if (!file_exists(sys_get_temp_dir() . "/post.tmp")) {
     38    if (!file_exists(sys_get_temp_dir() . "/cache_post-with-cached-subresources_state")) {
    3939        echo "<script>";
    4040        echo "xhr = new XMLHttpRequest;";
    41         echo "xhr.open('GET', '../resources/touch-temp-file.php?filename=post.tmp', false);";
     41        echo "xhr.open('GET', '../resources/touch-temp-file.php?filename=cache_post-with-cached-subresources_state', false);";
    4242        echo "xhr.send(null);";
    4343        echo "</script>";
    4444    }
    45     echo "<img src='resources/post-image-to-verify.php' onload=\"logAndFinish('PASS');\" onerror=\"logAndFinish('FAIL');\"></img>";
     45    echo "<img src='resources/post-image-to-verify.php?test=cache_post-with-cached-subresources' onload=\"logAndFinish('PASS');\" onerror=\"logAndFinish('FAIL');\"></img>";
    4646} else {
    4747    echo "<form action='post-with-cached-subresources.php' method='post'>";
    4848    echo "<input type='submit' id='submit' name='submit' value='finish'>";
    4949    echo "</form>";
    50     echo "<img src='resources/post-image-to-verify.php' onload=\"document.getElementById('submit').click();\" onerror=\"logAndFinish('FAIL on initial load');\"></img>";
     50    echo "<img src='resources/post-image-to-verify.php?test=cache_post-with-cached-subresources' onload=\"document.getElementById('submit').click();\" onerror=\"logAndFinish('FAIL on initial load');\"></img>";
    5151}
    5252?>

  • trunk/LayoutTests/http/tests/cache/reload-main-resource.php

    r142707 r175841  
    22require_once '../resources/portabilityLayer.php';
    33clearstatcache();
    4 if (file_exists(sys_get_temp_dir() . "/reload-main-resource.tmp"))
    5     unlink(sys_get_temp_dir() . "/reload-main-resource.tmp");
     4if (file_exists(sys_get_temp_dir() . "/cache-reload-main-resource.tmp"))
     5    unlink(sys_get_temp_dir() . "/cache-reload-main-resource.tmp");
    66?>
    77

  • trunk/LayoutTests/http/tests/cache/resources/network-error-during-revalidation-frame.html

    r139230 r175841  
    1 <img src="/resources/network-simulator.php?path=/misc/resources/compass.jpg&allow-caching=1">
     1<img src="/resources/network-simulator.php?test=cache-network-error-during-revalidation&path=/misc/resources/compass.jpg&allow-caching=1">

  • trunk/LayoutTests/http/tests/cache/resources/partitioned-cache-echo-state.php

    r154505 r175841  
    55header('Cache-Control: max-age=3600');
    66
    7 $tmpFile = sys_get_temp_dir() . "/" . "partitioned-cache-state";
     7# This script may only be used by cache/partitioned-cache.html test, since it uses global data.
     8$tmpFile = sys_get_temp_dir() . "/" . "cache-partitioned-cache-state";
    89?>
    910var response = '<?php print file_get_contents($tmpFile); ?>';

  • trunk/LayoutTests/http/tests/cache/resources/partitioned-cache-loader.html

    r154505 r175841  
    66{
    77    var xhr = new XMLHttpRequest;
    8     xhr.open('POST', '/resources/write-temp-file.php?filename=partitioned-cache-state&data=' + string, false);
     8    xhr.open('POST', '/resources/write-temp-file.php?filename=cache-partitioned-cache-state&data=' + string, false);
    99    xhr.send();
    1010}

  • trunk/LayoutTests/http/tests/cache/resources/post-image-to-verify.php

    r81665 r175841  
    33
    44clearstatcache();
    5 if (file_exists(sys_get_temp_dir() . "/post.tmp")) {
     5if (file_exists(sys_get_temp_dir() . "/" . $_GET["test"] . "_state")) {
    66    header('HTTP/1.1 404 Not Found');
    77    exit();
    88} else {
    9     $tmpFile = fopen(sys_get_temp_dir() . "/post.tmp", 'w');
     9    $tmpFile = fopen(sys_get_temp_dir() . "/" . $_GET["test"] . "_state", 'w');
    1010    fclose($tmpFile);
    1111   

  • trunk/LayoutTests/http/tests/cache/resources/reload-main-resource-iframe.php

    r142707 r175841  
    11<?php
    2 if (file_exists(sys_get_temp_dir() . "/reload-main-resource.tmp")) {
    3     unlink(sys_get_temp_dir() . "/reload-main-resource.tmp");
     2if (file_exists(sys_get_temp_dir() . "/cache-reload-main-resource.tmp")) {
     3    unlink(sys_get_temp_dir() . "/cache-reload-main-resource.tmp");
    44    echo "<body>";
    55    echo "<script>";
    … …  
    1010}
    1111
    12 $tmpFile = fopen(sys_get_temp_dir() . "/reload-main-resource.tmp", 'w');
     12$tmpFile = fopen(sys_get_temp_dir() . "/cache-reload-main-resource.tmp", 'w');
    1313fclose($tmpFile);
    1414

  • trunk/LayoutTests/http/tests/cache/stopped-revalidation.html

    r120167 r175841  
    55    testRunner.waitUntilDone();
    66}
    7 
    8 function setNetworkEnabled(state)
    9 {
    10     var req = new XMLHttpRequest;
    11     req.open("GET", "/resources/network-simulator.php?command=" + (state ? "connect" : "disconnect"), false);
    12     req.send("");
    13 }
    14 
    15 setNetworkEnabled(true);
    167
    178function test()

  • trunk/LayoutTests/http/tests/cache/subresource-fragment-identifier.html

    r120167 r175841  
    1212            try {
    1313                var req = new XMLHttpRequest;
    14                 req.open("GET", "http://127.0.0.1:8000/resources/network-simulator.php?command=" + cmd, false);
     14                req.open("GET", "http://127.0.0.1:8000/resources/network-simulator.php?test=cache-subresource-fragment-identifier&command=" + cmd, false);
    1515                req.send(null);
    1616                return req.responseText;
    … …  
    4242    <style>
    4343        div {
    44             background-image: url('http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=bg_pattern.jpg#div');
     44            background-image: url('http://127.0.0.1:8000/resources/network-simulator.php?test=cache-subresource-fragment-identifier&command=log-resource-request&path=bg_pattern.jpg#div');
    4545        }
    4646        p {
    47             background-image: url('http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=bg_pattern.jpg#p');
     47            background-image: url('http://127.0.0.1:8000/resources/network-simulator.php?test=cache-subresource-fragment-identifier&command=log-resource-request&path=bg_pattern.jpg#p');
    4848        }
    4949    </style>
    … …  
    5252<body>
    5353    <div style="width: 100px; height: 100px;"></div>
    54     <img src="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=bg_pattern.jpg#img1">
    55     <img src="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=bg_pattern.jpg#img2">
     54    <img src="http://127.0.0.1:8000/resources/network-simulator.php?test=cache-subresource-fragment-identifier&command=log-resource-request&path=bg_pattern.jpg#img1">
     55    <img src="http://127.0.0.1:8000/resources/network-simulator.php?test=cache-subresource-fragment-identifier&command=log-resource-request&path=bg_pattern.jpg#img2">
    5656   
    5757  Test that resources with fragment identifiers are loaded only once.

  • trunk/LayoutTests/http/tests/css/border-image-loading.html

    r66141 r175841  
    22<head>
    33  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     4  <!-- FIXME: This test relies on no preloading to happen before scripts run. -->
    45  <script src="resources/request-logging.js" type="text/javascript" charset="utf-8"></script>
     6  <script>ResourceLogging.start("css-border-image-loading");</script>
    57
    68  <style type="text/css">
    … …  
    810      height: 100px;
    911      width: 100px;
    10       -webkit-border-image: url("/resources/network-simulator.php?command=log-resource-request&path=border1.jpg") 10 10 10 10 stretch;
     12      -webkit-border-image: url("/resources/network-simulator.php?test=css-border-image-loading&command=log-resource-request&path=border1.jpg") 10 10 10 10 stretch;
    1113    }
    1214   
    1315    .bordered {
    14       -webkit-border-image: url("/resources/network-simulator.php?command=log-resource-request&path=border2.jpg") 10 10 10 10 stretch;
     16      -webkit-border-image: url("/resources/network-simulator.php?test=css-border-image-loading&command=log-resource-request&path=border2.jpg") 10 10 10 10 stretch;
    1517    }
    1618   

  • trunk/LayoutTests/http/tests/css/css-image-loading.html

    r66128 r175841  
    22<head>
    33  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     4  <!-- FIXME: This test relies on no preloading to happen before scripts run. -->
    45  <script src="resources/request-logging.js" type="text/javascript" charset="utf-8"></script>
     6  <script>ResourceLogging.start("css-css-image-loading");</script>
    57
    68  <style type="text/css">
    … …  
    810      height: 100px;
    911      width: 100px;
    10       background-image: url("/resources/network-simulator.php?command=log-resource-request&path=background1.jpg");
     12      background-image: url("/resources/network-simulator.php?test=css-css-image-loading&command=log-resource-request&path=background1.jpg");
    1113    }
    1214   
    1315    .background {
    14       background-image: url("/resources/network-simulator.php?command=log-resource-request&path=background2.jpg");
     16      background-image: url("/resources/network-simulator.php?test=css-css-image-loading&command=log-resource-request&path=background2.jpg");
    1517    }
    1618   
    1719    .content {
    18       content: url("/resources/network-simulator.php?command=log-resource-request&path=content-image1.jpg");
     20      content: url("/resources/network-simulator.php?test=css-css-image-loading&command=log-resource-request&path=content-image1.jpg");
    1921    }
    2022
    2123    .test {
    22       content: url("/resources/network-simulator.php?command=log-resource-request&path=content-image2.jpg") "foopy" url("/resources/network-simulator.php?command=log-resource-request&path=content-image3.jpg");
     24      content: url("/resources/network-simulator.php?test=css-css-image-loading&command=log-resource-request&path=content-image2.jpg") "foopy" url("/resources/network-simulator.php?test=css-css-image-loading&command=log-resource-request&path=content-image3.jpg");
    2325    }
    2426   
    2527    ul {
    26       list-style-image: url("/resources/network-simulator.php?command=log-resource-request&path=list-image1.jpg");
     28      list-style-image: url("/resources/network-simulator.php?test=css-css-image-loading&command=log-resource-request&path=list-image1.jpg");
    2729    }
    2830    .list {
    29       list-style-image: url("/resources/network-simulator.php?command=log-resource-request&path=list-image2.jpg");
     31      list-style-image: url("/resources/network-simulator.php?test=css-css-image-loading&command=log-resource-request&path=list-image2.jpg");
    3032    }
    3133   

  • trunk/LayoutTests/http/tests/css/mask-image-loading.html

    r66141 r175841  
    22<head>
    33  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     4  <!-- FIXME: This test relies on no preloading to happen before scripts run. -->
    45  <script src="resources/request-logging.js" type="text/javascript" charset="utf-8"></script>
     6  <script>ResourceLogging.start("css-mask-image-loading");</script>
    57
    68  <style type="text/css">
    … …  
    810      height: 100px;
    911      width: 100px;
    10       -webkit-mask-box-image: url("/resources/network-simulator.php?command=log-resource-request&path=mask1.jpg");
     12      -webkit-mask-box-image: url("/resources/network-simulator.php?test=css-mask-image-loading&command=log-resource-request&path=mask1.jpg");
    1113    }
    1214   
    1315    .masked {
    14       -webkit-mask-box-image: url("/resources/network-simulator.php?command=log-resource-request&path=mask2.jpg");
     16      -webkit-mask-box-image: url("/resources/network-simulator.php?test=css-mask-image-loading&command=log-resource-request&path=mask2.jpg");
    1517    }
    1618   

  • trunk/LayoutTests/http/tests/css/reflection-mask-image-loading.html

    r66141 r175841  
    22<head>
    33  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     4  <!-- FIXME: This test relies on no preloading to happen before scripts run. -->
    45  <script src="resources/request-logging.js" type="text/javascript" charset="utf-8"></script>
     6  <script>ResourceLogging.start("css-refleciton-mask-image-loading");</script>
    57
    68  <style type="text/css">
    … …  
    810      height: 100px;
    911      width: 100px;
    10       -webkit-box-reflect: below 10px url("/resources/network-simulator.php?command=log-resource-request&path=mask1.jpg");
     12      -webkit-box-reflect: below 10px url("/resources/network-simulator.php?test=css-refleciton-mask-image-loading&command=log-resource-request&path=mask1.jpg");
    1113    }
    1214   
    1315    .reflected {
    14       -webkit-box-reflect: below 10px url("/resources/network-simulator.php?command=log-resource-request&path=mask2.jpg");
     16      -webkit-box-reflect: below 10px url("/resources/network-simulator.php?test=css-refleciton-mask-image-loading&command=log-resource-request&path=mask2.jpg");
    1517    }
    1618   

  • trunk/LayoutTests/http/tests/css/resources/request-logging.js

    r120167 r175841  
    1 function CallCommand(cmd)
    2 {
    3  try {
    4      var req = new XMLHttpRequest;
    5      req.open("GET", "/resources/network-simulator.php?command=" + cmd, false);
    6      req.send(null);
    7      return req.responseText;
    8  } catch (ex) {
    9      return "";
    10  }
    11 }
     1var ResourceLogging = {
     2    CallCommand: function(cmd)
     3    {
     4        try {
     5            var req = new XMLHttpRequest;
     6            req.open("GET", "/resources/network-simulator.php?test=" + this.testName + "&command=" + cmd, false);
     7            req.send(null);
     8            return req.responseText;
     9        } catch (ex) {
     10            return "";
     11        }
     12    },
    1213
    13 function startTest()
    14 {
    15     if (window.testRunner) {
    16         testRunner.dumpAsText();
    17         testRunner.waitUntilDone();
    18     }
     14    startTest: function()
     15    {
     16        if (window.testRunner) {
     17            testRunner.dumpAsText();
     18            testRunner.waitUntilDone();
     19        }
    1920 
    20     window.setTimeout(endTest, 0);
    21 }
     21        window.setTimeout(this.endTest.bind(this), 0);
     22    },
    2223
    23 function endTest()
    24 {
    25     getResourceLog();
    26     CallCommand("clear-resource-request-log");
     24    endTest: function()
     25    {
     26        this.getResourceLog();
     27        this.CallCommand("clear-resource-request-log");
    2728
    28     if (window.testRunner)
    29         testRunner.notifyDone();
    30 }
     29        if (window.testRunner)
     30            testRunner.notifyDone();
     31    },
    3132
    32 function getResourceLog()
    33 {
    34     var log = CallCommand("get-resource-request-log");
    35     var logLines = log.split('\n');
    36     logLines.sort();
    37     document.getElementById('result').innerText = logLines.join('\n');
    38 }
     33    getResourceLog: function()
     34    {
     35        var log = this.CallCommand("get-resource-request-log");
     36        var logLines = log.split('\n');
     37        logLines.sort();
     38        document.getElementById('result').innerText = logLines.join('\n');
     39    },
    3940
    40 CallCommand("start-resource-request-log");
    41 window.addEventListener('load', startTest, false);
     41    start: function(testName)
     42    {
     43        this.testName = testName;
     44        this.CallCommand("start-resource-request-log");
     45        window.addEventListener('load', this.startTest.bind(this), false);
     46    },
     47};

  • trunk/LayoutTests/http/tests/loading/preload-img-test.html

    r120167 r175841  
    77       try {
    88           var req = new XMLHttpRequest;
    9            req.open("GET", "/resources/network-simulator.php?command=" + cmd, false);
     9           req.open("GET", "/resources/network-simulator.php?test=loading-preload-img-test&command=" + cmd, false);
    1010           req.send(null);
    1111           return req.responseText;
    … …  
    5050</head>
    5151<body onload="test()">
    52   <img id ="test_image" src="/resources/network-simulator.php?command=increase-resource-count&path=/loading/resources/preload-test.jpg" onerror="img_error()" onload="setTimeout(checkAccessCount, 3000)">
     52  <img id ="test_image" src="/resources/network-simulator.php?test=loading-preload-img-test&command=increase-resource-count&path=/loading/resources/preload-test.jpg" onerror="img_error()" onload="setTimeout(checkAccessCount, 3000)">
    5353  <p>This test is to test whether preload image will require 2 more requests or not.</p>
    5454  <span id="outputPanel">PASSED</span>

  • trunk/LayoutTests/http/tests/local/link-stylesheet-load-order-preload.html

    r120167 r175841  
    1515     try {
    1616         var req = new XMLHttpRequest;
    17          req.open("GET", "http://127.0.0.1:8000/resources/network-simulator.php?command=" + cmd, false);
     17         req.open("GET", "http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order-preload&command=" + cmd, false);
    1818         req.send(null);
    1919         return req.responseText;
    … …  
    4444 
    4545  <!-- This will trigger the preload scanner -->
    46   <script src="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=script.js"></script>
     46  <script src="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order-preload&command=log-resource-request&path=script.js"></script>
    4747
    48   <link rel=stylesheet href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=no-media.css">
    49   <link rel=stylesheet media="" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-empty.css">
    50   <link rel=stylesheet media="all" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-all.css">
    51   <link rel=stylesheet media="print" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-print.css">
    52   <link rel=stylesheet media="screen" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-screen.css">
    53   <link rel=stylesheet media="screen and (min-width: 1px)" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-screen-query-success.css">
    54   <link rel=stylesheet media="braille, screen" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-braille-screen.css">
    55   <link rel=stylesheet media="screen and (min-width: 1000000px)" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-screen-query-fail.css">
    56   <link rel=stylesheet media="aural" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-aural.css">
    57   <link rel=stylesheet media="braille" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-braille.css">
    58   <link rel=stylesheet media="handheld" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=median-handheld.css">
    59   <link rel=stylesheet media="projection" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-projection.css">
    60   <link rel=stylesheet media="tty" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-tty.css">
    61   <link rel=stylesheet media="tv" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-tv.css">
    62   <link rel=stylesheet href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=no-media-2.css">
    63   <link rel=stylesheet media="" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-empty-2.css">
    64   <link rel=stylesheet media="all" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-all-2.css">
    65   <link rel=stylesheet media="print" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-print-2.css">
    66   <link rel=stylesheet media="screen" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-screen-2.css">
    67   <link rel=stylesheet media="screen and (min-width: 1px)" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-screen-query-success-2.css">
    68   <link rel=stylesheet media="braille, screen" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-braille-screen-2.css">
    69   <link rel=stylesheet media="screen and (min-width: 1000000px)" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-screen-query-fail-2.css">
     48  <link rel=stylesheet href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order-preload&command=log-resource-request&path=no-media.css">
     49  <link rel=stylesheet media="" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order-preload&command=log-resource-request&path=media-empty.css">
     50  <link rel=stylesheet media="all" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order-preload&command=log-resource-request&path=media-all.css">
     51  <link rel=stylesheet media="print" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order-preload&command=log-resource-request&path=media-print.css">
     52  <link rel=stylesheet media="screen" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order-preload&command=log-resource-request&path=media-screen.css">
     53  <link rel=stylesheet media="screen and (min-width: 1px)" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order-preload&command=log-resource-request&path=media-screen-query-success.css">
     54  <link rel=stylesheet media="braille, screen" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order-preload&command=log-resource-request&path=media-braille-screen.css">
     55  <link rel=stylesheet media="screen and (min-width: 1000000px)" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order-preload&command=log-resource-request&path=media-screen-query-fail.css">
     56  <link rel=stylesheet media="aural" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order-preload&command=log-resource-request&path=media-aural.css">
     57  <link rel=stylesheet media="braille" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order-preload&command=log-resource-request&path=media-braille.css">
     58  <link rel=stylesheet media="handheld" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order-preload&command=log-resource-request&path=median-handheld.css">
     59  <link rel=stylesheet media="projection" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order-preload&command=log-resource-request&path=media-projection.css">
     60  <link rel=stylesheet media="tty" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order-preload&command=log-resource-request&path=media-tty.css">
     61  <link rel=stylesheet media="tv" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order-preload&command=log-resource-request&path=media-tv.css">
     62  <link rel=stylesheet href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order-preload&command=log-resource-request&path=no-media-2.css">
     63  <link rel=stylesheet media="" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order-preload&command=log-resource-request&path=media-empty-2.css">
     64  <link rel=stylesheet media="all" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order-preload&command=log-resource-request&path=media-all-2.css">
     65  <link rel=stylesheet media="print" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order-preload&command=log-resource-request&path=media-print-2.css">
     66  <link rel=stylesheet media="screen" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order-preload&command=log-resource-request&path=media-screen-2.css">
     67  <link rel=stylesheet media="screen and (min-width: 1px)" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order-preload&command=log-resource-request&path=media-screen-query-success-2.css">
     68  <link rel=stylesheet media="braille, screen" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order-preload&command=log-resource-request&path=media-braille-screen-2.css">
     69  <link rel=stylesheet media="screen and (min-width: 1000000px)" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order-preload&command=log-resource-request&path=media-screen-query-fail-2.css">
    7070 
    7171</head>
    7272<body>
    73   <img src="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=image.jpg">
    74   <script src="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=script-2.js"></script>
     73  <img src="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order-preload&command=log-resource-request&path=image.jpg">
     74  <script src="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order-preload&command=log-resource-request&path=script-2.js"></script>
    7575
    7676  Test stylesheet load scheduling with preload scanner. Resource loads for screen stylesheets should be scheduled first, others should be scheduled last.

  • trunk/LayoutTests/http/tests/local/link-stylesheet-load-order.html

    r120167 r175841  
    1515     try {
    1616         var req = new XMLHttpRequest;
    17          req.open("GET", "http://127.0.0.1:8000/resources/network-simulator.php?command=" + cmd, false);
     17         req.open("GET", "http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order&command=" + cmd, false);
    1818         req.send(null);
    1919         return req.responseText;
    … …  
    4343  </script>
    4444
    45   <link rel=stylesheet href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=no-media.css">
    46   <link rel=stylesheet media="" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-empty.css">
    47   <link rel=stylesheet media="all" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-all.css">
    48   <link rel=stylesheet media="print" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-print.css">
    49   <link rel=stylesheet media="screen" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-screen.css">
    50   <link rel=stylesheet media="screen and (min-width: 1px)" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-screen-query-success.css">
    51   <link rel=stylesheet media="braille, screen" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-braille-screen.css">
    52   <link rel=stylesheet media="screen and (min-width: 1000000px)" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-screen-query-fail.css">
    53   <link rel=stylesheet media="aural" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-aural.css">
    54   <link rel=stylesheet media="braille" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-braille.css">
    55   <link rel=stylesheet media="handheld" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=median-handheld.css">
    56   <link rel=stylesheet media="projection" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-projection.css">
    57   <link rel=stylesheet media="tty" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-tty.css">
    58   <link rel=stylesheet media="tv" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-tv.css">
    59   <link rel=stylesheet href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=no-media-2.css">
    60   <link rel=stylesheet media="" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-empty-2.css">
    61   <link rel=stylesheet media="all" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-all-2.css">
    62   <link rel=stylesheet media="print" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-print-2.css">
    63   <link rel=stylesheet media="screen" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-screen-2.css">
    64   <link rel=stylesheet media="screen and (min-width: 1px)" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-screen-query-success-2.css">
    65   <link rel=stylesheet media="braille, screen" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-braille-screen-2.css">
    66   <link rel=stylesheet media="screen and (min-width: 1000000px)" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-screen-query-fail-2.css">
     45  <link rel=stylesheet href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order&command=log-resource-request&path=no-media.css">
     46  <link rel=stylesheet media="" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order&command=log-resource-request&path=media-empty.css">
     47  <link rel=stylesheet media="all" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order&command=log-resource-request&path=media-all.css">
     48  <link rel=stylesheet media="print" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order&command=log-resource-request&path=media-print.css">
     49  <link rel=stylesheet media="screen" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order&command=log-resource-request&path=media-screen.css">
     50  <link rel=stylesheet media="screen and (min-width: 1px)" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order&command=log-resource-request&path=media-screen-query-success.css">
     51  <link rel=stylesheet media="braille, screen" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order&command=log-resource-request&path=media-braille-screen.css">
     52  <link rel=stylesheet media="screen and (min-width: 1000000px)" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order&command=log-resource-request&path=media-screen-query-fail.css">
     53  <link rel=stylesheet media="aural" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order&command=log-resource-request&path=media-aural.css">
     54  <link rel=stylesheet media="braille" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order&command=log-resource-request&path=media-braille.css">
     55  <link rel=stylesheet media="handheld" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order&command=log-resource-request&path=median-handheld.css">
     56  <link rel=stylesheet media="projection" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order&command=log-resource-request&path=media-projection.css">
     57  <link rel=stylesheet media="tty" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order&command=log-resource-request&path=media-tty.css">
     58  <link rel=stylesheet media="tv" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order&command=log-resource-request&path=media-tv.css">
     59  <link rel=stylesheet href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order&command=log-resource-request&path=no-media-2.css">
     60  <link rel=stylesheet media="" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order&command=log-resource-request&path=media-empty-2.css">
     61  <link rel=stylesheet media="all" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order&command=log-resource-request&path=media-all-2.css">
     62  <link rel=stylesheet media="print" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order&command=log-resource-request&path=media-print-2.css">
     63  <link rel=stylesheet media="screen" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order&command=log-resource-request&path=media-screen-2.css">
     64  <link rel=stylesheet media="screen and (min-width: 1px)" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order&command=log-resource-request&path=media-screen-query-success-2.css">
     65  <link rel=stylesheet media="braille, screen" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order&command=log-resource-request&path=media-braille-screen-2.css">
     66  <link rel=stylesheet media="screen and (min-width: 1000000px)" href="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order&command=log-resource-request&path=media-screen-query-fail-2.css">
    6767 
    6868</head>
    6969<body>
    70   <img src="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=image.jpg">
    71   <script src="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=script.js"></script>
     70  <img src="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order&command=log-resource-request&path=image.jpg">
     71  <script src="http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order&command=log-resource-request&path=script.js"></script>
    7272
    7373  Test stylesheet load scheduling. Resource loads for screen stylesheets should be scheduled first, others should be scheduled last.

  • trunk/LayoutTests/http/tests/misc/link-rel-prefetch-and-subresource.html

    r120167 r175841  
    66 try {
    77     var req = new XMLHttpRequest;
    8      req.open("GET", "/resources/network-simulator.php?command=" + cmd, false);
     8     req.open("GET", "/resources/network-simulator.php?test=misc-link-rel-prefetch-and-subresource&command=" + cmd, false);
    99     req.send(null);
    1010     return req.responseText;
    … …  
    5858  }
    5959  </script>
    60   <link rel=prefetch onload="decrementLinkLoadCount()" href="/resources/network-simulator.php?command=log-resource-request&path=1st.jpg">
    61   <link rel=subresource onload="decrementLinkLoadCount()" href="/resources/network-simulator.php?command=log-resource-request&path=2nd.jpg">
    62   <link rel=prefetch onload="decrementLinkLoadCount()" href="/resources/network-simulator.php?command=log-resource-request&path=3rd.jpg">
    63   <link rel=prefetch onload="decrementLinkLoadCount()" href="/resources/network-simulator.php?command=log-resource-request&path=4th.jpg">
    64   <link rel=subresource onload="decrementLinkLoadCount()" href="/resources/network-simulator.php?command=log-resource-request&path=5th.jpg">
     60  <link rel=prefetch onload="decrementLinkLoadCount()" href="/resources/network-simulator.php?test=misc-link-rel-prefetch-and-subresource&command=log-resource-request&path=1st.jpg">
     61  <link rel=subresource onload="decrementLinkLoadCount()" href="/resources/network-simulator.php?test=misc-link-rel-prefetch-and-subresource&command=log-resource-request&path=2nd.jpg">
     62  <link rel=prefetch onload="decrementLinkLoadCount()" href="/resources/network-simulator.php?test=misc-link-rel-prefetch-and-subresource&command=log-resource-request&path=3rd.jpg">
     63  <link rel=prefetch onload="decrementLinkLoadCount()" href="/resources/network-simulator.php?test=misc-link-rel-prefetch-and-subresource&command=log-resource-request&path=4th.jpg">
     64  <link rel=subresource onload="decrementLinkLoadCount()" href="/resources/network-simulator.php?test=misc-link-rel-prefetch-and-subresource&command=log-resource-request&path=5th.jpg">
    6565</head>
    6666<body>

  • trunk/LayoutTests/http/tests/resources/network-simulator.php

    r139230 r175841  
    66
    77if (!sys_get_temp_dir()) {
     8    header("HTTP/1.1 500 Internal Server Error");
    89    echo "FAIL: No temp dir was returned.\n";
    910    exit();
     11}
     12
     13if (!isset($_GET['test'])) {
     14    header("HTTP/1.1 500 Internal Server Error");
     15    echo "test parameter must be specified for a unique test name\n";
     16    exit();
     17}
     18
     19function tempPathBase()
     20{
     21    return sys_get_temp_dir() . "/" . $_GET['test'];
    1022}
    1123
    … …  
    90102function handleIncreaseResourceCountCommand($path)
    91103{
    92     $resourceCountFile = sys_get_temp_dir() . "/resource-count";
     104    $resourceCountFile = tempPathBase() . "-count";
    93105    $resourceCount = getState($resourceCountFile);
    94106    $pieces = explode(" ", $resourceCount);
    … …  
    105117function handleResetResourceCountCommand()
    106118{
    107     $resourceCountFile = sys_get_temp_dir() . "/resource-count";
     119    $resourceCountFile = tempPathBase() . "-count";
    108120    file_put_contents($resourceCountFile, 0);
    109121    generateNoCacheHTTPHeader();
    … …  
    113125function handleGetResourceCountCommand($path)
    114126{
    115     $resourceCountFile = sys_get_temp_dir() . "/resource-count";
     127    $resourceCountFile = tempPathBase() . "-count";
    116128    $resourceCount = getState($resourceCountFile);
    117129    $pieces = explode(" ", $resourceCount);
    … …  
    127139function handleStartResourceRequestsLog()
    128140{
    129     $resourceLogFile = sys_get_temp_dir() . "/resource-log";
     141    $resourceLogFile = tempPathBase() . "-log";
    130142    file_put_contents($resourceLogFile,  "");
    131143}
    … …  
    133145function handleClearResourceRequestsLog()
    134146{
    135     $resourceLogFile = sys_get_temp_dir() . "/resource-log";
     147    $resourceLogFile = tempPathBase() . "-log";
    136148    file_put_contents($resourceLogFile, "");
    137149}
    … …  
    139151function handleGetResourceRequestsLog()
    140152{
    141     $resourceLogFile = sys_get_temp_dir() . "/resource-log";
     153    $resourceLogFile = tempPathBase() . "-log";
    142154
    143155    generateNoCacheHTTPHeader();
    … …  
    149161function handleLogResourceRequest($path)
    150162{
    151     $resourceLogFile = sys_get_temp_dir() . "/resource-log";
     163    $resourceLogFile = tempPathBase() . "-log";
    152164   
    153165    $newData = "\n".$path;
    … …  
    156168}
    157169
    158 $stateFile = sys_get_temp_dir() . "/network-simulator-state";
     170$stateFile = tempPathBase() . "-state";
    159171$command = $_GET['command'];
    160172if ($command) {

  • trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-header-denied-expected.txt

    r104803 r175841  
    1 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=header. Request header field X-NON-STANDARD is not allowed by Access-Control-Allow-Headers.
     1CONSOLE 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.
    22PASS: Request successfully blocked.
    33

  • trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-header-denied.html

    r120167 r175841  
    1717
    1818    try {
    19         xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=reset", false);
     19        xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-async-header-denied&state=reset", false);
    2020        xhr.send(null);
    2121    } catch(e) {
    … …  
    2727
    2828    try {
    29         xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=header", true);
     29        xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-async-header-denied&state=header", true);
    3030        xhr.setRequestHeader("X-NON-STANDARD", "filler");
    3131    } catch(e) {
    … …  
    3838
    3939        try {
    40             xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=complete", false);
     40            xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-async-header-denied&state=complete", false);
    4141            try {
    4242                xhr.send(null);

  • trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-method-denied-expected.txt

    r104803 r175841  
    1 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=method. Method DELETE is not allowed by Access-Control-Allow-Methods.
     1CONSOLE 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.
    22PASS: Request successfully blocked.
    33

  • trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-method-denied.html

    r120167 r175841  
    1717
    1818    try {
    19         xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=reset", false);
     19        xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-async-method-denied&state=reset", false);
    2020        xhr.send(null);
    2121    } catch(e) {
    … …  
    2727
    2828    try {
    29         xhr.open("DELETE", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=method", true);
     29        xhr.open("DELETE", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-async-method-denied&state=method", true);
    3030    } catch(e) {
    3131        log("FAIL: Exception thrown. Cross-domain access is not allowed in first 'open'. [" + e.message + "].");
    … …  
    3737
    3838        try {
    39             xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=complete", false);
     39            xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-async-method-denied&state=complete", false);
    4040            try {
    4141                xhr.send(null);

  • trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-not-supported-expected.txt

    r104803 r175841  
    1 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
     1CONSOLE 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.
    22PASS: Request successfully blocked.
    33

  • trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-not-supported.html

    r120167 r175841  
    1717
    1818    try {
    19         xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=reset", false);
     19        xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-async-non-supported&state=reset", false);
    2020        xhr.send(null);
    2121    } catch(e) {
    … …  
    2727
    2828    try {
    29         xhr.open("PUT", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php", true);
     29        xhr.open("PUT", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-async-non-supported", true);
    3030    } catch(e) {
    3131        log("FAIL: Exception thrown. Cross-domain access is not allowed in first 'open'. [" + e.message + "].");
    … …  
    3737
    3838        try {
    39             xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=complete", false);
     39            xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-async-non-supported&state=complete", false);
    4040            try {
    4141                xhr.send(null);

  • trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-headers-async.html

    r120167 r175841  
    99{
    1010    var req = new XMLHttpRequest;
    11     req.open("GET", "/resources/reset-temp-file.php?filename=access-control-preflight-headers-status", false);
     11    req.open("GET", "/resources/reset-temp-file.php?filename=access-control-preflight-headers-async-status", false);
    1212    req.send();
    1313}
    … …  
    1616{
    1717    var req = new XMLHttpRequest;
    18     req.open("GET", "http://localhost:8000/xmlhttprequest/resources/no-custom-header.php");
     18    req.open("GET", "http://localhost:8000/xmlhttprequest/resources/no-custom-header.php?filename=access-control-preflight-headers-async-status");
    1919    req.setRequestHeader("X-Custom-Header", "foobar");
    2020    req.onerror = function() {

  • trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-headers-sync.html

    r120167 r175841  
    77{
    88    var req = new XMLHttpRequest;
    9     req.open("GET", "/resources/reset-temp-file.php?filename=access-control-preflight-headers-status", false);
     9    req.open("GET", "/resources/reset-temp-file.php?filename=access-control-preflight-headers-sync-status", false);
    1010    req.send();
    1111}
    … …  
    1515    try {
    1616        var req = new XMLHttpRequest;
    17         req.open("GET", "http://localhost:8000/xmlhttprequest/resources/no-custom-header.php", false);
     17        req.open("GET", "http://localhost:8000/xmlhttprequest/resources/no-custom-header.php?filename=access-control-preflight-headers-sync-status", false);
    1818        req.setRequestHeader("X-Custom-Header", "foobar");
    1919        req.send();

  • trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-header-denied-expected.txt

    r104803 r175841  
    1 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=header. Request header field X-NON-STANDARD is not allowed by Access-Control-Allow-Headers.
     1CONSOLE MESSAGE: 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.
    22PASS: Request successfully blocked.
    33

  • trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-header-denied.html

    r120167 r175841  
    1515
    1616    try {
    17         xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=reset", false);
     17        xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-sync-header-denied&state=reset", false);
    1818        xhr.send(null);
    1919    } catch(e) {
    … …  
    2525
    2626    try {
    27         xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=header", false);
     27        xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-sync-header-denied&state=header", false);
    2828        xhr.setRequestHeader("X-NON-STANDARD", "filler");
    2929    } catch(e) {
    … …  
    4343
    4444    try {
    45         xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=complete", false);
     45        xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-sync-header-denied&state=complete", false);
    4646    } catch(e) {
    4747        log("FAIL: Exception thrown. Cross-domain access is not allowed in second 'open'. [" + e.message + "].");

  • trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-method-denied-expected.txt

    r104803 r175841  
    1 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=method. Method DELETE is not allowed by Access-Control-Allow-Methods.
     1CONSOLE MESSAGE: 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.
    22PASS: Request successfully blocked.
    33

  • trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-method-denied.html

    r120167 r175841  
    1515
    1616    try {
    17         xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=reset", false);
     17        xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-sync-method-denied&state=reset", false);
    1818        xhr.send(null);
    1919    } catch(e) {
    … …  
    2525
    2626    try {
    27         xhr.open("DELETE", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=method", false);
     27        xhr.open("DELETE", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-sync-method-denied&state=method", false);
    2828    } catch(e) {
    2929        log("FAIL: Exception thrown. Cross-domain access is not allowed in first 'open'. [" + e.message + "].");
    … …  
    4242
    4343    try {
    44         xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=complete", false);
     44        xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-sync-method-denied&state=complete", false);
    4545    } catch(e) {
    4646        log("FAIL: Exception thrown. Cross-domain access is not allowed in second 'open'. [" + e.message + "].");

  • trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-not-supported-expected.txt

    r104803 r175841  
    1 CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
     1CONSOLE MESSAGE: 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.
    22PASS: Request successfully blocked.
    33

  • trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-not-supported.html

    r120167 r175841  
    1515
    1616    try {
    17         xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=reset", false);
     17        xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-sync-non-supported&state=reset", false);
    1818        xhr.send(null);
    1919    } catch(e) {
    … …  
    2525
    2626    try {
    27         xhr.open("PUT", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php", false);
     27        xhr.open("PUT", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-sync-non-supported", false);
    2828    } catch(e) {
    2929        log("FAIL: Exception thrown. Cross-domain access is not allowed in first 'open'. [" + e.message + "].");
    … …  
    4242
    4343    try {
    44         xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=complete", false);
     44        xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-sync-non-supported&state=complete", false);
    4545    } catch(e) {
    4646        log("FAIL: Exception thrown. Cross-domain access is not allowed in second 'open'. [" + e.message + "].");

  • trunk/LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-tripmine.html

    r120167 r175841  
    1515{
    1616    var req = new XMLHttpRequest;
    17     req.open("GET", "/resources/reset-temp-file.php?filename=tripmine-status", false);
     17    req.open("GET", "/resources/reset-temp-file.php?filename=xmlhttprequest-redirect-cross-origin-tripmine_status", false);
    1818    req.send();
    1919}
    … …  
    2222{
    2323    var req = new XMLHttpRequest;
    24     req.open("GET", "/resources/tripmine.php?command=status", false);
     24    req.open("GET", "resources/redirect-cross-origin-tripmine.php?command=status", false);
    2525    req.send();
    2626    return req.responseText;
    … …  
    4242
    4343    var req = new XMLHttpRequest;
    44     req.open(method, "/resources/redirect.php?code=" + code + "&url=http://localhost:8000/resources/tripmine.php", true);
     44    req.open(method, "/resources/redirect.php?code=" + code + "&url=http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php", true);
    4545    req.setRequestHeader("X-WebKit-Test", "*");
    4646    req.setRequestHeader("Content-Type", "application/xml");
    … …  
    5656
    5757    var req = new XMLHttpRequest;
    58     req.open(method, "/resources/redirect.php?code=" + code + "&url=http://localhost:8000/resources/tripmine.php", false);
     58    req.open(method, "/resources/redirect.php?code=" + code + "&url=http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php", false);
    5959    req.setRequestHeader("X-WebKit-Test", "*");
    6060    req.setRequestHeader("Content-Type", "application/xml");

  • trunk/LayoutTests/http/tests/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php

    r62779 r175841  
    22require_once '../../resources/portabilityLayer.php';
    33
    4 $tmpFile = sys_get_temp_dir() . "/xsrf.txt";
     4$tmpFile = sys_get_temp_dir() . "/" . $_GET["test"];
    55
    66function fail($state)

  • trunk/LayoutTests/http/tests/xmlhttprequest/resources/no-custom-header.php

    r47494 r175841  
    22require_once '../../resources/portabilityLayer.php';
    33
    4 $stateFile = sys_get_temp_dir() . "/access-control-preflight-headers-status";
     4$stateFile = sys_get_temp_dir() . "/" . $_GET['filename'];
    55
    66function setState($newState, $file)

  • trunk/LayoutTests/http/tests/xmlhttprequest/resources/redirect-cross-origin-tripmine.php

    r175731 r175841  
    11<?php
    2 require_once 'portabilityLayer.php';
     2require_once '../../resources/portabilityLayer.php';
    33
    44// This script detects requests that could not be sent before cross-site XMLHttpRequest appeared.
    … …  
    2626}
    2727
    28 $stateFile = sys_get_temp_dir() . "/tripmine-status";
     28$stateFile = sys_get_temp_dir() . "/xmlhttprequest-redirect-cross-origin-tripmine_status";
    2929$command = $_GET['command'];
    3030if ($command) {

  • trunk/LayoutTests/http/tests/xmlhttprequest/state-after-network-error.html

    r120167 r175841  
    1818{
    1919    var req = new XMLHttpRequest;
    20     req.open("GET", "/resources/network-simulator.php?command=" + (state ? "connect" : "disconnect"), false);
     20    req.open("GET", "/resources/network-simulator.php?test=xmlhttprequest-state-after-network-error&command=" + (state ? "connect" : "disconnect"), false);
    2121    req.send("");
    2222}
    … …  
    3535var xhr = new XMLHttpRequest();
    3636xhr.onreadystatechange = onReadyStateChange;
    37 xhr.open('GET', '/resources/network-simulator.php?path=/', true);
     37xhr.open('GET', '/resources/network-simulator.php?test=xmlhttprequest-state-after-network-error&path=/', true);
    3838xhr.send(null);
    3939

  • trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-responseURL-expected.txt

    r175053 r175841  
    5050req.readyState = 1: responseURL =
    5151PASS responseURL is ""
    52 req.readyState = 2: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/network-simulator.php?command=connect/
    53 req.readyState = 3: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/network-simulator.php?command=connect/
    54 req.readyState = 4: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/network-simulator.php?command=connect/
    55 PASS responseURL is "http://127.0.0.1:8000/xmlhttprequest/resources/network-simulator.php?command=connect/"
    56 req.readyState = 0: responseURL =
    57 PASS responseURL is ""
    58 req.readyState = 1: responseURL =
    59 PASS responseURL is ""
    60 req.readyState = 1: responseURL =
    61 PASS responseURL is ""
    6252req.readyState = 2: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/supported-xml-content-types.cgi?type=foo
    6353req.readyState = 3: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/supported-xml-content-types.cgi?type=foo

  • trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-responseURL.html

    r175053 r175841  
    5454    shouldBeEqualToString('responseURL', 'http://127.0.0.1:8000/xmlhttprequest/resources/cross-site-progress-events.cgi');
    5555
    56     return runTest('resources/network-simulator.php?command=connect/', 'text');
    57 }).then(function(req) {
    58     window.responseURL = req.responseURL;
    59     shouldBeEqualToString('responseURL', 'http://127.0.0.1:8000/xmlhttprequest/resources/network-simulator.php?command=connect/');
    60 
    6156    return runTest("resources/supported-xml-content-types.cgi?type=foo#bar/baz+xml", 'xml');
    6257}).then(function(req) {
Note: See TracChangeset for help on using the changeset viewer.