<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[175841] trunk/LayoutTests</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/175841">175841</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-11-10 17:16:15 -0800 (Mon, 10 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestsappcachefailonupdate2html">trunk/LayoutTests/http/tests/appcache/fail-on-update-2.html</a></li>
<li><a href="#trunkLayoutTestshttptestsappcachefallbackhtml">trunk/LayoutTests/http/tests/appcache/fallback.html</a></li>
<li><a href="#trunkLayoutTestshttptestsappcachemainresourcefallbackfornetworkerrorcrashhtml">trunk/LayoutTests/http/tests/appcache/main-resource-fallback-for-network-error-crash.html</a></li>
<li><a href="#trunkLayoutTestshttptestsappcachemainresourcehashhtml">trunk/LayoutTests/http/tests/appcache/main-resource-hash.html</a></li>
<li><a href="#trunkLayoutTestshttptestsappcachemainresourceredirecthtml">trunk/LayoutTests/http/tests/appcache/main-resource-redirect.html</a></li>
<li><a href="#trunkLayoutTestshttptestsappcachemultifallbackhtml">trunk/LayoutTests/http/tests/appcache/multi-fallback.html</a></li>
<li><a href="#trunkLayoutTestshttptestsappcachenonhtmlxhtml">trunk/LayoutTests/http/tests/appcache/non-html.xhtml</a></li>
<li><a href="#trunkLayoutTestshttptestsappcacheofflineaccesshtml">trunk/LayoutTests/http/tests/appcache/offline-access.html</a></li>
<li><a href="#trunkLayoutTestshttptestsappcacheonlinewhitelisthtml">trunk/LayoutTests/http/tests/appcache/online-whitelist.html</a></li>
<li><a href="#trunkLayoutTestshttptestsappcacheremovecachehtml">trunk/LayoutTests/http/tests/appcache/remove-cache.html</a></li>
<li><a href="#trunkLayoutTestshttptestsappcacheresourcesfailonupdate2php">trunk/LayoutTests/http/tests/appcache/resources/fail-on-update-2.php</a></li>
<li><a href="#trunkLayoutTestshttptestsappcacheresourcesfailonupdatephp">trunk/LayoutTests/http/tests/appcache/resources/fail-on-update.php</a></li>
<li><a href="#trunkLayoutTestshttptestsappcacheresourcesmainresourceredirectframephp">trunk/LayoutTests/http/tests/appcache/resources/main-resource-redirect-frame.php</a></li>
<li><a href="#trunkLayoutTestshttptestsappcacheresourcesmainresourceredirectmanifest">trunk/LayoutTests/http/tests/appcache/resources/main-resource-redirect.manifest</a></li>
<li><a href="#trunkLayoutTestshttptestsappcacheresourcesnonhtmlmanifest">trunk/LayoutTests/http/tests/appcache/resources/non-html.manifest</a></li>
<li><a href="#trunkLayoutTestshttptestsappcacheresourcesofflineaccessframehtml">trunk/LayoutTests/http/tests/appcache/resources/offline-access-frame.html</a></li>
<li><a href="#trunkLayoutTestshttptestsappcacheresourcesofflineaccessjs">trunk/LayoutTests/http/tests/appcache/resources/offline-access.js</a></li>
<li><a href="#trunkLayoutTestshttptestsappcacheresourcesofflineaccessmanifest">trunk/LayoutTests/http/tests/appcache/resources/offline-access.manifest</a></li>
<li><a href="#trunkLayoutTestshttptestsappcacheresourcesonlinewhitelistmanifest">trunk/LayoutTests/http/tests/appcache/resources/online-whitelist.manifest</a></li>
<li><a href="#trunkLayoutTestshttptestsappcacheresourcesremovecacheframe2html">trunk/LayoutTests/http/tests/appcache/resources/remove-cache-frame-2.html</a></li>
<li><a href="#trunkLayoutTestshttptestsappcacheresourcesremovecacheframehtml">trunk/LayoutTests/http/tests/appcache/resources/remove-cache-frame.html</a></li>
<li><a href="#trunkLayoutTestshttptestsappcacheupdatecachehtml">trunk/LayoutTests/http/tests/appcache/update-cache.html</a></li>
<li><a href="#trunkLayoutTestshttptestscachenetworkerrorduringrevalidationhtml">trunk/LayoutTests/http/tests/cache/network-error-during-revalidation.html</a></li>
<li><a href="#trunkLayoutTestshttptestscachepostredirectgetphp">trunk/LayoutTests/http/tests/cache/post-redirect-get.php</a></li>
<li><a href="#trunkLayoutTestshttptestscachepostwithcachedsubresourcesphp">trunk/LayoutTests/http/tests/cache/post-with-cached-subresources.php</a></li>
<li><a href="#trunkLayoutTestshttptestscachereloadmainresourcephp">trunk/LayoutTests/http/tests/cache/reload-main-resource.php</a></li>
<li><a href="#trunkLayoutTestshttptestscacheresourcesnetworkerrorduringrevalidationframehtml">trunk/LayoutTests/http/tests/cache/resources/network-error-during-revalidation-frame.html</a></li>
<li><a href="#trunkLayoutTestshttptestscacheresourcespartitionedcacheechostatephp">trunk/LayoutTests/http/tests/cache/resources/partitioned-cache-echo-state.php</a></li>
<li><a href="#trunkLayoutTestshttptestscacheresourcespartitionedcacheloaderhtml">trunk/LayoutTests/http/tests/cache/resources/partitioned-cache-loader.html</a></li>
<li><a href="#trunkLayoutTestshttptestscacheresourcespostimagetoverifyphp">trunk/LayoutTests/http/tests/cache/resources/post-image-to-verify.php</a></li>
<li><a href="#trunkLayoutTestshttptestscacheresourcesreloadmainresourceiframephp">trunk/LayoutTests/http/tests/cache/resources/reload-main-resource-iframe.php</a></li>
<li><a href="#trunkLayoutTestshttptestscachestoppedrevalidationhtml">trunk/LayoutTests/http/tests/cache/stopped-revalidation.html</a></li>
<li><a href="#trunkLayoutTestshttptestscachesubresourcefragmentidentifierhtml">trunk/LayoutTests/http/tests/cache/subresource-fragment-identifier.html</a></li>
<li><a href="#trunkLayoutTestshttptestscssborderimageloadinghtml">trunk/LayoutTests/http/tests/css/border-image-loading.html</a></li>
<li><a href="#trunkLayoutTestshttptestscsscssimageloadinghtml">trunk/LayoutTests/http/tests/css/css-image-loading.html</a></li>
<li><a href="#trunkLayoutTestshttptestscssmaskimageloadinghtml">trunk/LayoutTests/http/tests/css/mask-image-loading.html</a></li>
<li><a href="#trunkLayoutTestshttptestscssreflectionmaskimageloadinghtml">trunk/LayoutTests/http/tests/css/reflection-mask-image-loading.html</a></li>
<li><a href="#trunkLayoutTestshttptestscssresourcesrequestloggingjs">trunk/LayoutTests/http/tests/css/resources/request-logging.js</a></li>
<li><a href="#trunkLayoutTestshttptestsloadingpreloadimgtesthtml">trunk/LayoutTests/http/tests/loading/preload-img-test.html</a></li>
<li><a href="#trunkLayoutTestshttptestslocallinkstylesheetloadorderpreloadhtml">trunk/LayoutTests/http/tests/local/link-stylesheet-load-order-preload.html</a></li>
<li><a href="#trunkLayoutTestshttptestslocallinkstylesheetloadorderhtml">trunk/LayoutTests/http/tests/local/link-stylesheet-load-order.html</a></li>
<li><a href="#trunkLayoutTestshttptestsmisclinkrelprefetchandsubresourcehtml">trunk/LayoutTests/http/tests/misc/link-rel-prefetch-and-subresource.html</a></li>
<li><a href="#trunkLayoutTestshttptestsresourcesnetworksimulatorphp">trunk/LayoutTests/http/tests/resources/network-simulator.php</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestaccesscontrolpreflightasyncheaderdeniedexpectedtxt">trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-header-denied-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestaccesscontrolpreflightasyncheaderdeniedhtml">trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-header-denied.html</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestaccesscontrolpreflightasyncmethoddeniedexpectedtxt">trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-method-denied-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestaccesscontrolpreflightasyncmethoddeniedhtml">trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-method-denied.html</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestaccesscontrolpreflightasyncnotsupportedexpectedtxt">trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-not-supported-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestaccesscontrolpreflightasyncnotsupportedhtml">trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-not-supported.html</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestaccesscontrolpreflightheadersasynchtml">trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-headers-async.html</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestaccesscontrolpreflightheaderssynchtml">trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-headers-sync.html</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestaccesscontrolpreflightsyncheaderdeniedexpectedtxt">trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-header-denied-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestaccesscontrolpreflightsyncheaderdeniedhtml">trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-header-denied.html</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestaccesscontrolpreflightsyncmethoddeniedexpectedtxt">trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-method-denied-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestaccesscontrolpreflightsyncmethoddeniedhtml">trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-method-denied.html</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestaccesscontrolpreflightsyncnotsupportedexpectedtxt">trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-not-supported-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestaccesscontrolpreflightsyncnotsupportedhtml">trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-not-supported.html</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestredirectcrossorigintripminehtml">trunk/LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-tripmine.html</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestresourcesaccesscontrolpreflightdeniedxsrfphp">trunk/LayoutTests/http/tests/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestresourcesnocustomheaderphp">trunk/LayoutTests/http/tests/xmlhttprequest/resources/no-custom-header.php</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequeststateafternetworkerrorhtml">trunk/LayoutTests/http/tests/xmlhttprequest/state-after-network-error.html</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestxmlhttprequestresponseURLexpectedtxt">trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-responseURL-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestxmlhttprequestresponseURLhtml">trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-responseURL.html</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsappcacheresourcesonlinewhitelistphp">trunk/LayoutTests/http/tests/appcache/resources/online-whitelist.php</a></li>
<li><a href="#trunkLayoutTestshttptestsappcacheresourcesremovecachephp">trunk/LayoutTests/http/tests/appcache/resources/remove-cache.php</a></li>
<li><a href="#trunkLayoutTestshttptestsappcacheresourcesupdatecachephp">trunk/LayoutTests/http/tests/appcache/resources/update-cache.php</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestresourcesredirectcrossorigintripminephp">trunk/LayoutTests/http/tests/xmlhttprequest/resources/redirect-cross-origin-tripmine.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsappcacheresourcescounterphp">trunk/LayoutTests/http/tests/appcache/resources/counter.php</a></li>
<li><a href="#trunkLayoutTestshttptestsappcacheresourcesversionedmanifestphp">trunk/LayoutTests/http/tests/appcache/resources/versioned-manifest.php</a></li>
<li><a href="#trunkLayoutTestshttptestsresourcestripminephp">trunk/LayoutTests/http/tests/resources/tripmine.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/ChangeLog 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,3 +1,86 @@
</span><ins>+2014-11-10 Alexey Proskuryakov <ap@apple.com>
+
+ 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:
+
</ins><span class="cx"> 2014-11-10 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> Add test for fix of REGRESSION (r174985-174986): Site display disappears
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsappcachefailonupdate2html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/fail-on-update-2.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/fail-on-update-2.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/appcache/fail-on-update-2.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> function setManifestDeleted(state)
</span><span class="cx"> {
</span><span class="cx"> var req = new XMLHttpRequest;
</span><del>- req.open("GET", "resources/fail-on-update.php?command=" + (state ? "delete" : "reset"), false);
</del><ins>+ req.open("GET", "resources/fail-on-update-2.php?command=" + (state ? "delete" : "reset"), false);
</ins><span class="cx"> req.send(null);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsappcachefallbackhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/fallback.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/fallback.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/appcache/fallback.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> {
</span><span class="cx"> try {
</span><span class="cx"> var req = new XMLHttpRequest;
</span><del>- req.open("GET", "/resources/network-simulator.php?command=" + (state ? "connect" : "disconnect"), false);
</del><ins>+ req.open("GET", "/resources/network-simulator.php?test=appcache-fallback&command=" + (state ? "connect" : "disconnect"), false);
</ins><span class="cx"> req.send("");
</span><span class="cx"> } catch (ex) {
</span><span class="cx"> log("Cannot access network simulator URL");
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-var testURL = "/resources/network-simulator.php?path=/appcache/resources/not-in-cache.txt";
</del><ins>+var testURL = "/resources/network-simulator.php?test=appcache-fallback&path=/appcache/resources/not-in-cache.txt";
</ins><span class="cx"> var nonexistentURL = "resources/does-not-exist";
</span><span class="cx"> var redirectURL = "resources/fallback-redirect.php";
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsappcachemainresourcefallbackfornetworkerrorcrashhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/main-resource-fallback-for-network-error-crash.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/main-resource-fallback-for-network-error-crash.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/appcache/main-resource-fallback-for-network-error-crash.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> <div> Before you click the link that tests the appcache fallback, please make sure the server is down or disconnect your device from any data connection so the connection request to the server will fail.
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<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>
</del><ins>+<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>
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> <script>
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> function setNetworkEnabled(state)
</span><span class="cx"> {
</span><span class="cx"> var req = new XMLHttpRequest;
</span><del>- req.open("GET", "/resources/network-simulator.php?command=" + (state ? "connect" : "disconnect"), false);
</del><ins>+ req.open("GET", "/resources/network-simulator.php?test=appcache-main-resource-fallback-for-network-error-crash&command=" + (state ? "connect" : "disconnect"), false);
</ins><span class="cx"> req.send("");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (window.testRunner) {
</span><span class="cx"> setNetworkEnabled(false);
</span><del>- window.location="/resources/network-simulator.php?path=does-not-exist";
</del><ins>+ window.location="/resources/network-simulator.php?test=appcache-main-resource-fallback-for-network-error-crash&path=does-not-exist";
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsappcachemainresourcehashhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/main-resource-hash.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/main-resource-hash.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/appcache/main-resource-hash.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> function setNetworkEnabled(state)
</span><span class="cx"> {
</span><span class="cx"> var req = new XMLHttpRequest;
</span><del>- req.open("GET", "/resources/network-simulator.php?command=" + (state ? "connect" : "disconnect"), false);
</del><ins>+ req.open("GET", "/resources/network-simulator.php?test=appcache-main-resource-main-resource-hash&command=" + (state ? "connect" : "disconnect"), false);
</ins><span class="cx"> req.send("");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> stage = 1;
</span><span class="cx"> setNetworkEnabled(false);
</span><span class="cx"> var ifr = document.createElement("iframe");
</span><del>- ifr.setAttribute("src", "/resources/network-simulator.php?path=/appcache/resources/main-resource-hash-frame.html#bar");
</del><ins>+ ifr.setAttribute("src", "/resources/network-simulator.php?test=appcache-main-resource-main-resource-hash&path=/appcache/resources/main-resource-hash-frame.html#bar");
</ins><span class="cx"> document.body.appendChild(ifr);
</span><span class="cx"> } else {
</span><span class="cx"> log("SUCCESS");
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> var stage = 0;
</span><span class="cx"> setNetworkEnabled(true);
</span><span class="cx"> var ifr = document.createElement("iframe");
</span><del>-ifr.setAttribute("src", "/resources/network-simulator.php?path=/appcache/resources/main-resource-hash-frame.html#foo");
</del><ins>+ifr.setAttribute("src", "/resources/network-simulator.php?test=appcache-main-resource-main-resource-hash&path=/appcache/resources/main-resource-hash-frame.html#foo");
</ins><span class="cx"> document.body.appendChild(ifr);
</span><span class="cx">
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsappcachemainresourceredirecthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/main-resource-redirect.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/main-resource-redirect.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/appcache/main-resource-redirect.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> function setNetworkEnabled(state)
</span><span class="cx"> {
</span><span class="cx"> var req = new XMLHttpRequest;
</span><del>- req.open("GET", "/resources/network-simulator.php?command=" + (state ? "connect" : "disconnect"), false);
</del><ins>+ req.open("GET", "/resources/network-simulator.php?test=appcache-main-resource-main-resource-redirect&command=" + (state ? "connect" : "disconnect"), false);
</ins><span class="cx"> req.send("");
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsappcachemultifallbackhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/multi-fallback.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/multi-fallback.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/appcache/multi-fallback.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> {
</span><span class="cx"> try {
</span><span class="cx"> var req = new XMLHttpRequest;
</span><del>- req.open("GET", "/resources/network-simulator.php?command=" + (state ? "connect" : "disconnect"), false);
</del><ins>+ req.open("GET", "/resources/network-simulator.php?test=appcache-multi-fallback&command=" + (state ? "connect" : "disconnect"), false);
</ins><span class="cx"> req.send("");
</span><span class="cx"> } catch (ex) {
</span><span class="cx"> log("Cannot access network simulator URL, ex = " + ex);
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsappcachenonhtmlxhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/non-html.xhtml (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/non-html.xhtml 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/appcache/non-html.xhtml 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> <html xmlns="http://www.w3.org/1999/xhtml"
</span><del>- manifest="/resources/network-simulator.php?path=/appcache/resources/non-html.manifest">
</del><ins>+ manifest="/resources/network-simulator.php?test=appcache-non-html&amp;path=/appcache/resources/non-html.manifest">
</ins><span class="cx"> <head><title/></head>
</span><span class="cx"> <body>
</span><span class="cx"> <p>Test that non-HTML main resources work with application cache correctly.</p>
</span><span class="lines">@@ -19,14 +19,14 @@
</span><span class="cx"> function setNetworkEnabled(state)
</span><span class="cx"> {
</span><span class="cx"> var req = new XMLHttpRequest;
</span><del>- req.open("GET", "/resources/network-simulator.php?command=" + (state ? "connect" : "disconnect"), false);
</del><ins>+ req.open("GET", "/resources/network-simulator.php?test=appcache-non-html&amp;command=" + (state ? "connect" : "disconnect"), false);
</ins><span class="cx"> req.send("");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function createFrame()
</span><span class="cx"> {
</span><span class="cx"> var ifr = document.createElement("iframe");
</span><del>- ifr.setAttribute("src", "/resources/network-simulator.php?path=/appcache/resources/abe.png");
</del><ins>+ ifr.setAttribute("src", "/resources/network-simulator.php?test=appcache-non-html&amp;path=/appcache/resources/abe.png");
</ins><span class="cx"> ifr.onload = frameCreated;
</span><span class="cx"> document.body.appendChild(ifr);
</span><span class="cx"> }
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> // Load a resource that does not exist in the cache.
</span><span class="cx"> try {
</span><span class="cx"> var req = new XMLHttpRequest();
</span><del>- req.open("GET", "/resources/network-simulator.php?path=/appcache/resources/not-in-cache.txt", false);
</del><ins>+ req.open("GET", "/resources/network-simulator.php?test=appcache-non-html&amp;path=/appcache/resources/not-in-cache.txt", false);
</ins><span class="cx"> req.send();
</span><span class="cx"> } catch (e) {
</span><span class="cx"> if (e.code == XMLHttpRequestException.NETWORK_ERR)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> // Load a resource that exists in the cache.
</span><span class="cx"> try {
</span><span class="cx"> var req = new XMLHttpRequest();
</span><del>- req.open("GET", "/resources/network-simulator.php?path=/appcache/resources/simple.txt", false);
</del><ins>+ req.open("GET", "/resources/network-simulator.php?test=appcache-non-html&amp;path=/appcache/resources/simple.txt", false);
</ins><span class="cx"> req.send();
</span><span class="cx"> } catch (e) {
</span><span class="cx"> document.getElementById('result').innerHTML = "FAILURE: Could not load data from cache"
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsappcacheofflineaccesshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/offline-access.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/offline-access.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/appcache/offline-access.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -18,14 +18,14 @@
</span><span class="cx"> function setNetworkEnabled(state)
</span><span class="cx"> {
</span><span class="cx"> var req = new XMLHttpRequest;
</span><del>- req.open("GET", "/resources/network-simulator.php?command=" + (state ? "connect" : "disconnect"), false);
</del><ins>+ req.open("GET", "/resources/network-simulator.php?test=appcache-offline-access&command=" + (state ? "connect" : "disconnect"), false);
</ins><span class="cx"> req.send("");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function createFrame()
</span><span class="cx"> {
</span><span class="cx"> var ifr = document.createElement("iframe");
</span><del>- ifr.setAttribute("src", "/resources/network-simulator.php?path=/appcache/resources/offline-access-frame.html");
</del><ins>+ ifr.setAttribute("src", "/resources/network-simulator.php?test=appcache-offline-access&path=/appcache/resources/offline-access-frame.html");
</ins><span class="cx"> document.body.appendChild(ifr);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsappcacheonlinewhitelisthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/online-whitelist.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/online-whitelist.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/appcache/online-whitelist.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -43,22 +43,22 @@
</span><span class="cx">
</span><span class="cx"> function test()
</span><span class="cx"> {
</span><del>- if (load("resources/counter.php?cached") != load("resources/counter.php?cached")) {
</del><ins>+ if (load("resources/online-whitelist.php?cached") != load("resources/online-whitelist.php?cached")) {
</ins><span class="cx"> log("FAIL: Explicit entry didn't override online whitelist.");
</span><span class="cx"> hadError = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (load("resources/counter.php?uncached") == load("resources/counter.php?uncached")) {
</del><ins>+ if (load("resources/online-whitelist.php?uncached") == load("resources/online-whitelist.php?uncached")) {
</ins><span class="cx"> log("FAIL: Online whitelist resource wasn't reloaded from network.");
</span><span class="cx"> hadError = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (load("resources/counter.php?uncachedxxx") == load("resources/counter.php?uncachedxxx")) {
</del><ins>+ if (load("resources/online-whitelist.php?uncachedxxx") == load("resources/online-whitelist.php?uncachedxxx")) {
</ins><span class="cx"> log("FAIL: Online whitelist resource wasn't reloaded from network (prefix matching).");
</span><span class="cx"> hadError = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (canLoad("resources/counter.php?foobar")) {
</del><ins>+ if (canLoad("resources/online-whitelist.php?foobar")) {
</ins><span class="cx"> log("FAIL: Uncached resource was successfully loaded.");
</span><span class="cx"> hadError = true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsappcacheremovecachehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/remove-cache.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/remove-cache.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/appcache/remove-cache.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-<html manifest="resources/fail-on-update.php">
</del><ins>+<html manifest="resources/remove-cache.php">
</ins><span class="cx"> <p>Test that a 404 response for manifest results in cache removal.</p>
</span><span class="cx"> <body>
</span><span class="cx"> <ul>
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> function setManifestDeleted(state)
</span><span class="cx"> {
</span><span class="cx"> var req = new XMLHttpRequest;
</span><del>- req.open("GET", "resources/fail-on-update.php?command=" + (state ? "delete" : "reset"), false);
</del><ins>+ req.open("GET", "resources/remove-cache.php?command=" + (state ? "delete" : "reset"), false);
</ins><span class="cx"> req.send(null);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsappcacheresourcescounterphp"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/appcache/resources/counter.php (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/resources/counter.php 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/appcache/resources/counter.php 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,23 +0,0 @@
</span><del>-<?php
-require_once '../../resources/portabilityLayer.php';
-
-$tmpFile = sys_get_temp_dir() . "/" . "appcache_counter";
-
-function stepCounter($file)
-{
- if (!file_exists($file)) {
- file_put_contents($file, "0");
- return "0";
- }
- $value = file_get_contents($file);
- file_put_contents($file, ++$value);
- return $value;
-}
-
-header("Expires: Thu, 01 Dec 2003 16:00:00 GMT");
-header("Cache-Control: no-cache, must-revalidate");
-header("Pragma: no-cache");
-header("Content-Type: text/plain");
-
-print(stepCounter($tmpFile));
-?>
</del></span></pre></div>
<a id="trunkLayoutTestshttptestsappcacheresourcesfailonupdate2php"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/resources/fail-on-update-2.php (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/resources/fail-on-update-2.php 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/appcache/resources/fail-on-update-2.php 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,7 +1,8 @@
</span><span class="cx"> <?php
</span><span class="cx"> require_once '../../resources/portabilityLayer.php';
</span><span class="cx">
</span><del>-$tmpFile = sys_get_temp_dir() . "/" . "fail_on_update_state";
</del><ins>+# This script may only be used by appcache/fail-on-update-2.html test, since it uses global data.
+$tmpFile = sys_get_temp_dir() . "/" . "appcache_fail-on-update-2_state";
</ins><span class="cx">
</span><span class="cx"> function setState($newState, $file)
</span><span class="cx"> {
</span><span class="lines">@@ -32,7 +33,7 @@
</span><span class="cx"> print("CACHE MANIFEST\n");
</span><span class="cx"> print("fail-on-update-2.html\n");
</span><span class="cx"> print("NETWORK:\n");
</span><del>- print("fail-on-update.php?command=\n");
</del><ins>+ print("fail-on-update-2.php?command=\n");
</ins><span class="cx"> } else if ($state == "Deleted") {
</span><span class="cx"> header('HTTP/1.0 404 Not Found');
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsappcacheresourcesfailonupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/resources/fail-on-update.php (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/resources/fail-on-update.php 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/appcache/resources/fail-on-update.php 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,7 +1,8 @@
</span><span class="cx"> <?php
</span><span class="cx"> require_once '../../resources/portabilityLayer.php';
</span><span class="cx">
</span><del>-$tmpFile = sys_get_temp_dir() . "/" . "fail_on_update_state";
</del><ins>+# This script may only be used by appcache/fail-on-update.html test, since it uses global data.
+$tmpFile = sys_get_temp_dir() . "/" . "appcache_fail-on-update_state";
</ins><span class="cx">
</span><span class="cx"> function setState($newState, $file)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsappcacheresourcesmainresourceredirectframephp"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/resources/main-resource-redirect-frame.php (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/resources/main-resource-redirect-frame.php 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/appcache/resources/main-resource-redirect-frame.php 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><span class="cx"> <?php
</span><span class="cx"> header('HTTP/1.0 302 Found');
</span><del>- header('Location: http://127.0.0.1:8000/resources/network-simulator.php?path=/appcache/resources/main-resource-redirect-frame-2.html');
</del><ins>+ 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');
</ins><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsappcacheresourcesmainresourceredirectmanifest"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/resources/main-resource-redirect.manifest (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/resources/main-resource-redirect.manifest 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/appcache/resources/main-resource-redirect.manifest 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><span class="cx"> CACHE MANIFEST
</span><del>-http://127.0.0.1:8000/resources/network-simulator.php?path=/appcache/resources/main-resource-redirect-frame-2.html
</del><ins>+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
</ins><span class="cx"> NETWORK:
</span><del>-http://127.0.0.1:8000/resources/network-simulator.php?command
</del><ins>+http://127.0.0.1:8000/resources/network-simulator.php?test=appcache-main-resource-main-resource-redirect&command
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsappcacheresourcesnonhtmlmanifest"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/resources/non-html.manifest (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/resources/non-html.manifest 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/appcache/resources/non-html.manifest 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx"> CACHE MANIFEST
</span><span class="cx"> /appcache/non-html.xhtml
</span><del>-/resources/network-simulator.php?path=/appcache/resources/simple.txt
-/resources/network-simulator.php?path=/appcache/resources/abe.png
-/resources/network-simulator.php?path=/appcache/resources/non-html.manifest
</del><ins>+/resources/network-simulator.php?test=appcache-non-html&path=/appcache/resources/simple.txt
+/resources/network-simulator.php?test=appcache-non-html&path=/appcache/resources/abe.png
+/resources/network-simulator.php?test=appcache-non-html&path=/appcache/resources/non-html.manifest
</ins><span class="cx"> NETWORK:
</span><span class="cx"> /favicon.ico
</span><del>-/resources/network-simulator.php?command=
</del><ins>+/resources/network-simulator.php?test=appcache-non-html&command=
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsappcacheresourcesofflineaccessframehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/resources/offline-access-frame.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/resources/offline-access-frame.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/appcache/resources/offline-access-frame.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-<html manifest="/resources/network-simulator.php?path=/appcache/resources/offline-access.manifest">
</del><ins>+<html manifest="/resources/network-simulator.php?test=appcache-offline-access&path=/appcache/resources/offline-access.manifest">
</ins><span class="cx"> <div id=result></div>
</span><span class="cx"> <script>
</span><span class="cx"> function log(message)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> applicationCache.onupdateready = function() { log("updateready") }
</span><span class="cx"> applicationCache.onobsolete = function() { log("obsolete") }
</span><span class="cx"> </script>
</span><del>-<script src="/resources/network-simulator.php?path=/appcache/resources/offline-access.js"></script>
</del><ins>+<script src="/resources/network-simulator.php?test=appcache-offline-access&path=/appcache/resources/offline-access.js"></script>
</ins><span class="cx"> <script>
</span><span class="cx">
</span><span class="cx"> applicationCache.oncached = function() { log("cached"); test() }
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsappcacheresourcesofflineaccessjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/resources/offline-access.js (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/resources/offline-access.js 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/appcache/resources/offline-access.js 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx">
</span><span class="cx"> try {
</span><span class="cx"> var req = new XMLHttpRequest;
</span><del>- req.open("GET", "/resources/network-simulator.php?path=/appcache/resources/simple.txt", false);
</del><ins>+ req.open("GET", "/resources/network-simulator.php?test=appcache-offline-access&path=/appcache/resources/simple.txt", false);
</ins><span class="cx"> req.send(null);
</span><span class="cx"> if (req.responseText == "Hello, World!")
</span><span class="cx"> parent.postMessage("done", "*");
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsappcacheresourcesofflineaccessmanifest"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/resources/offline-access.manifest (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/resources/offline-access.manifest 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/appcache/resources/offline-access.manifest 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> CACHE MANIFEST
</span><del>-/resources/network-simulator.php?path=/appcache/resources/offline-access-frame.html
-/resources/network-simulator.php?path=/appcache/resources/offline-access.manifest
-/resources/network-simulator.php?path=/appcache/resources/simple.txt
-/resources/network-simulator.php?path=/appcache/resources/offline-access.js
</del><ins>+/resources/network-simulator.php?test=appcache-offline-access&path=/appcache/resources/offline-access-frame.html
+/resources/network-simulator.php?test=appcache-offline-access&path=/appcache/resources/offline-access.manifest
+/resources/network-simulator.php?test=appcache-offline-access&path=/appcache/resources/simple.txt
+/resources/network-simulator.php?test=appcache-offline-access&path=/appcache/resources/offline-access.js
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsappcacheresourcesonlinewhitelistmanifest"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/resources/online-whitelist.manifest (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/resources/online-whitelist.manifest 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/appcache/resources/online-whitelist.manifest 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> CACHE MANIFEST
</span><del>-counter.php?cached
</del><ins>+online-whitelist.php?cached
</ins><span class="cx">
</span><span class="cx"> NETWORK:
</span><span class="cx"> # These are prefixes for requests we test, but they are not same origin, so they will be skipped.
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> http://127.0.0.1:8
</span><span class="cx">
</span><span class="cx"> # This should be ignored, because explicit entries are checked before online whitelist
</span><del>-counter.php?cached
</del><ins>+online-whitelist.php?cached
</ins><span class="cx">
</span><span class="cx"> # This should work normally.
</span><del>-counter.php?uncached
</del><span class="cx">\ No newline at end of file
</span><ins>+online-whitelist.php?uncached
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsappcacheresourcesonlinewhitelistphpfromrev175731trunkLayoutTestshttptestsappcacheresourcescounterphp"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/http/tests/appcache/resources/online-whitelist.php (from rev 175731, trunk/LayoutTests/http/tests/appcache/resources/counter.php) (0 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/resources/online-whitelist.php (rev 0)
+++ trunk/LayoutTests/http/tests/appcache/resources/online-whitelist.php 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<?php
+require_once '../../resources/portabilityLayer.php';
+
+# This script may only be used by appcache/online-whitelist.html test, since it uses global data.
+$tmpFile = sys_get_temp_dir() . "/" . "appcache_online-whitelist_state";
+
+function stepCounter($file)
+{
+ if (!file_exists($file)) {
+ file_put_contents($file, "0");
+ return "0";
+ }
+ $value = file_get_contents($file);
+ file_put_contents($file, ++$value);
+ return $value;
+}
+
+header("Expires: Thu, 01 Dec 2003 16:00:00 GMT");
+header("Cache-Control: no-cache, must-revalidate");
+header("Pragma: no-cache");
+header("Content-Type: text/plain");
+
+print(stepCounter($tmpFile));
+?>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsappcacheresourcesremovecacheframe2html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/resources/remove-cache-frame-2.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/resources/remove-cache-frame-2.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/appcache/resources/remove-cache-frame-2.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-<html manifest="fail-on-update.php">
</del><ins>+<html manifest="remove-cache.php">
</ins><span class="cx"> <body>
</span><span class="cx"> <div id=result></div>
</span><span class="cx"> <script>
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsappcacheresourcesremovecacheframehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/resources/remove-cache-frame.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/resources/remove-cache-frame.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/appcache/resources/remove-cache-frame.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-<html manifest="fail-on-update.php">
</del><ins>+<html manifest="remove-cache.php">
</ins><span class="cx"> <body>
</span><span class="cx"> <div id=result></div>
</span><span class="cx"> <script>
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsappcacheresourcesremovecachephpfromrev175731trunkLayoutTestshttptestsappcacheresourcesfailonupdatephp"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/http/tests/appcache/resources/remove-cache.php (from rev 175731, trunk/LayoutTests/http/tests/appcache/resources/fail-on-update.php) (0 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/resources/remove-cache.php (rev 0)
+++ trunk/LayoutTests/http/tests/appcache/resources/remove-cache.php 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+<?php
+require_once '../../resources/portabilityLayer.php';
+
+# This script may only be used by appcache/remove-cache.html test, since it uses global data.
+$tmpFile = sys_get_temp_dir() . "/" . "appcache_remove-cache_state";
+
+function setState($newState, $file)
+{
+ file_put_contents($file, $newState);
+}
+
+function getState($file)
+{
+ if (!file_exists($file)) {
+ return "Uninitialized";
+ }
+ return file_get_contents($file);
+}
+
+$command = $_GET['command'];
+$state = getState($tmpFile);
+
+header("Expires: Thu, 01 Dec 2003 16:00:00 GMT");
+header("Cache-Control: no-cache, must-revalidate");
+header("Pragma: no-cache");
+
+if ($command == "reset") {
+ unlink($tmpFile);
+} else if ($command == "delete") {
+ setState("Deleted", $tmpFile);
+} else if ($state == "Uninitialized") {
+ header("Content-Type: text/cache-manifest");
+ print("CACHE MANIFEST\n");
+ print("NETWORK:\n");
+ print("remove-cache.php?command=\n");
+} else if ($state == "Deleted") {
+ header('HTTP/1.0 404 Not Found');
+}
+?>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsappcacheresourcesupdatecachephpfromrev175731trunkLayoutTestshttptestsappcacheresourcesversionedmanifestphp"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/http/tests/appcache/resources/update-cache.php (from rev 175731, trunk/LayoutTests/http/tests/appcache/resources/versioned-manifest.php) (0 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/resources/update-cache.php (rev 0)
+++ trunk/LayoutTests/http/tests/appcache/resources/update-cache.php 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+<?php
+require_once '../../resources/portabilityLayer.php';
+
+# This script may only be used by appcache/update-cache.html test, since it uses global data.
+$tmpFile = sys_get_temp_dir() . "/" . "appcache_update-cache_state";
+
+function getCount($file)
+{
+ if (!file_exists($file)) {
+ file_put_contents($file, "0");
+ return "0";
+ }
+ return file_get_contents($file);
+}
+
+function stepCounter($file)
+{
+ if (file_exists($file)) {
+ $value = getCount($file);
+ file_put_contents($file, ++$value);
+ }
+}
+
+header("Expires: Thu, 01 Dec 2003 16:00:00 GMT");
+header("Cache-Control: no-cache, must-revalidate");
+header("Pragma: no-cache");
+header("Content-Type: text/cache-manifest");
+
+if ("step" == $_GET['command'])
+ stepCounter($tmpFile);
+
+print("CACHE MANIFEST\n");
+print("# version " . getCount($tmpFile) . "\n");
+print("uncacheable-resource.php\n"); // with Cache-control: no-store
+print("NETWORK:\n");
+print("update-cache.php?command=\n");
+?>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsappcacheresourcesversionedmanifestphp"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/appcache/resources/versioned-manifest.php (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/resources/versioned-manifest.php 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/appcache/resources/versioned-manifest.php 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,37 +0,0 @@
</span><del>-<?php
-require_once '../../resources/portabilityLayer.php';
-
-$tmpFile = sys_get_temp_dir() . "/" . "appcache_manifest_counter";
-
-function getCount($file)
-{
- if (!file_exists($file)) {
- file_put_contents($file, "0");
- return "0";
- }
- return file_get_contents($file);
-}
-
-function stepCounter($file)
-{
- if (file_exists($file)) {
- $value = getCount($file);
- file_put_contents($file, ++$value);
- }
-}
-
-header("Expires: Thu, 01 Dec 2003 16:00:00 GMT");
-header("Cache-Control: no-cache, must-revalidate");
-header("Pragma: no-cache");
-header("Content-Type: text/cache-manifest");
-
-if ("step" == $_GET['command'])
- stepCounter($tmpFile);
-
-print("CACHE MANIFEST\n");
-print("# version " . getCount($tmpFile) . "\n");
-print("counter.php\n");
-print("uncacheable-resource.php\n"); // with Cache-control: no-store
-print("NETWORK:\n");
-print("versioned-manifest.php?command=\n");
-?>
</del></span></pre></div>
<a id="trunkLayoutTestshttptestsappcacheupdatecachehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/update-cache.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/update-cache.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/appcache/update-cache.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-<html manifest="resources/versioned-manifest.php">
</del><ins>+<html manifest="resources/update-cache.php">
</ins><span class="cx"> <body>
</span><span class="cx"> <p>Test a simple offline application self-update process. Should print a series of messages followed with DONE:</p>
</span><span class="cx"> <div id=result></div>
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> function modifyManifest()
</span><span class="cx"> {
</span><span class="cx"> var req = new XMLHttpRequest;
</span><del>- req.open("GET", "resources/versioned-manifest.php?command=step", false);
</del><ins>+ req.open("GET", "resources/update-cache.php?command=step", false);
</ins><span class="cx"> req.send(false);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscachenetworkerrorduringrevalidationhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/cache/network-error-during-revalidation.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/network-error-during-revalidation.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/cache/network-error-during-revalidation.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> {
</span><span class="cx"> log(state ? "Enabling network" : "Disabling network");
</span><span class="cx"> var req = new XMLHttpRequest;
</span><del>- req.open("GET", "/resources/network-simulator.php?command=" + (state ? "connect" : "disconnect"), false);
</del><ins>+ req.open("GET", "/resources/network-simulator.php?test=cache-network-error-during-revalidation&command=" + (state ? "connect" : "disconnect"), false);
</ins><span class="cx"> req.send("");
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscachepostredirectgetphp"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/cache/post-redirect-get.php (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/post-redirect-get.php 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/cache/post-redirect-get.php 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> {
</span><span class="cx"> document.getElementById("result").appendChild(document.createTextNode(message));
</span><span class="cx"> var xhr = new XMLHttpRequest;
</span><del>- xhr.open("GET", "../resources/reset-temp-file.php?filename=post.tmp", false);
</del><ins>+ xhr.open("GET", "../resources/reset-temp-file.php?filename=cache_post-redirect-get_state", false);
</ins><span class="cx"> xhr.send(null);
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.notifyDone();
</span><span class="lines">@@ -41,19 +41,19 @@
</span><span class="cx"> if ($_GET["finish"] == "true") {
</span><span class="cx"> // The initial load of the image might have been done from the cache. In that case, touch the
</span><span class="cx"> // state file to indicate a load has already occurred.
</span><del>- if (!file_exists(sys_get_temp_dir() . "/post.tmp")) {
</del><ins>+ if (!file_exists(sys_get_temp_dir() . "/cache_post-redirect-get_state")) {
</ins><span class="cx"> echo "<script>";
</span><span class="cx"> echo "xhr = new XMLHttpRequest;";
</span><del>- echo "xhr.open('GET', '../resources/touch-temp-file.php?filename=post.tmp', false);";
</del><ins>+ echo "xhr.open('GET', '../resources/touch-temp-file.php?filename=cache_post-redirect-get_state', false);";
</ins><span class="cx"> echo "xhr.send(null);";
</span><span class="cx"> echo "</script>";
</span><span class="cx"> }
</span><del>- echo "<img src='resources/post-image-to-verify.php' onload=\"logAndFinish('PASS');\" onerror=\"logAndFinish('FAIL');\"></img>";
</del><ins>+ echo "<img src='resources/post-image-to-verify.php?test=cache_post-redirect-get' onload=\"logAndFinish('PASS');\" onerror=\"logAndFinish('FAIL');\"></img>";
</ins><span class="cx"> } else {
</span><span class="cx"> echo "<form action='post-redirect-get.php' method='post'>";
</span><span class="cx"> echo "<input type='submit' id='submit' name='submit' value='redirect'>";
</span><span class="cx"> echo "</form>";
</span><del>- echo "<img src='resources/post-image-to-verify.php' onload=\"document.getElementById('submit').click();\" onerror=\"logAndFinish('FAIL on initial load');\"></img>";
</del><ins>+ 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>";
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscachepostwithcachedsubresourcesphp"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/cache/post-with-cached-subresources.php (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/post-with-cached-subresources.php 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/cache/post-with-cached-subresources.php 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> {
</span><span class="cx"> document.getElementById("result").appendChild(document.createTextNode(message));
</span><span class="cx"> var xhr = new XMLHttpRequest;
</span><del>- xhr.open("GET", "../resources/reset-temp-file.php?filename=post.tmp", false);
</del><ins>+ xhr.open("GET", "../resources/reset-temp-file.php?filename=cache_post-with-cached-subresources_state", false);
</ins><span class="cx"> xhr.send(null);
</span><span class="cx"> if (window.testRunner)
</span><span class="cx"> testRunner.notifyDone();
</span><span class="lines">@@ -35,19 +35,19 @@
</span><span class="cx"> if ($_POST["submit"] == "finish") {
</span><span class="cx"> // The initial load of the image might have been done from the cache. In that case, touch the
</span><span class="cx"> // state file to indicate a load has already occurred.
</span><del>- if (!file_exists(sys_get_temp_dir() . "/post.tmp")) {
</del><ins>+ if (!file_exists(sys_get_temp_dir() . "/cache_post-with-cached-subresources_state")) {
</ins><span class="cx"> echo "<script>";
</span><span class="cx"> echo "xhr = new XMLHttpRequest;";
</span><del>- echo "xhr.open('GET', '../resources/touch-temp-file.php?filename=post.tmp', false);";
</del><ins>+ echo "xhr.open('GET', '../resources/touch-temp-file.php?filename=cache_post-with-cached-subresources_state', false);";
</ins><span class="cx"> echo "xhr.send(null);";
</span><span class="cx"> echo "</script>";
</span><span class="cx"> }
</span><del>- echo "<img src='resources/post-image-to-verify.php' onload=\"logAndFinish('PASS');\" onerror=\"logAndFinish('FAIL');\"></img>";
</del><ins>+ echo "<img src='resources/post-image-to-verify.php?test=cache_post-with-cached-subresources' onload=\"logAndFinish('PASS');\" onerror=\"logAndFinish('FAIL');\"></img>";
</ins><span class="cx"> } else {
</span><span class="cx"> echo "<form action='post-with-cached-subresources.php' method='post'>";
</span><span class="cx"> echo "<input type='submit' id='submit' name='submit' value='finish'>";
</span><span class="cx"> echo "</form>";
</span><del>- echo "<img src='resources/post-image-to-verify.php' onload=\"document.getElementById('submit').click();\" onerror=\"logAndFinish('FAIL on initial load');\"></img>";
</del><ins>+ 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>";
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscachereloadmainresourcephp"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/cache/reload-main-resource.php (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/reload-main-resource.php 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/cache/reload-main-resource.php 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><span class="cx"> <?php
</span><span class="cx"> require_once '../resources/portabilityLayer.php';
</span><span class="cx"> clearstatcache();
</span><del>-if (file_exists(sys_get_temp_dir() . "/reload-main-resource.tmp"))
- unlink(sys_get_temp_dir() . "/reload-main-resource.tmp");
</del><ins>+if (file_exists(sys_get_temp_dir() . "/cache-reload-main-resource.tmp"))
+ unlink(sys_get_temp_dir() . "/cache-reload-main-resource.tmp");
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <body>
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscacheresourcesnetworkerrorduringrevalidationframehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/cache/resources/network-error-during-revalidation-frame.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/resources/network-error-during-revalidation-frame.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/cache/resources/network-error-during-revalidation-frame.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1 +1 @@
</span><del>-<img src="/resources/network-simulator.php?path=/misc/resources/compass.jpg&allow-caching=1">
</del><ins>+<img src="/resources/network-simulator.php?test=cache-network-error-during-revalidation&path=/misc/resources/compass.jpg&allow-caching=1">
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscacheresourcespartitionedcacheechostatephp"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/cache/resources/partitioned-cache-echo-state.php (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/resources/partitioned-cache-echo-state.php 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/cache/resources/partitioned-cache-echo-state.php 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -4,6 +4,7 @@
</span><span class="cx"> header('Content-Type: application/javascript');
</span><span class="cx"> header('Cache-Control: max-age=3600');
</span><span class="cx">
</span><del>-$tmpFile = sys_get_temp_dir() . "/" . "partitioned-cache-state";
</del><ins>+# This script may only be used by cache/partitioned-cache.html test, since it uses global data.
+$tmpFile = sys_get_temp_dir() . "/" . "cache-partitioned-cache-state";
</ins><span class="cx"> ?>
</span><span class="cx"> var response = '<?php print file_get_contents($tmpFile); ?>';
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscacheresourcespartitionedcacheloaderhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/cache/resources/partitioned-cache-loader.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/resources/partitioned-cache-loader.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/cache/resources/partitioned-cache-loader.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> function setServerState(string)
</span><span class="cx"> {
</span><span class="cx"> var xhr = new XMLHttpRequest;
</span><del>- xhr.open('POST', '/resources/write-temp-file.php?filename=partitioned-cache-state&data=' + string, false);
</del><ins>+ xhr.open('POST', '/resources/write-temp-file.php?filename=cache-partitioned-cache-state&data=' + string, false);
</ins><span class="cx"> xhr.send();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscacheresourcespostimagetoverifyphp"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/cache/resources/post-image-to-verify.php (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/resources/post-image-to-verify.php 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/cache/resources/post-image-to-verify.php 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -2,11 +2,11 @@
</span><span class="cx"> require_once '../../resources/portabilityLayer.php';
</span><span class="cx">
</span><span class="cx"> clearstatcache();
</span><del>-if (file_exists(sys_get_temp_dir() . "/post.tmp")) {
</del><ins>+if (file_exists(sys_get_temp_dir() . "/" . $_GET["test"] . "_state")) {
</ins><span class="cx"> header('HTTP/1.1 404 Not Found');
</span><span class="cx"> exit();
</span><span class="cx"> } else {
</span><del>- $tmpFile = fopen(sys_get_temp_dir() . "/post.tmp", 'w');
</del><ins>+ $tmpFile = fopen(sys_get_temp_dir() . "/" . $_GET["test"] . "_state", 'w');
</ins><span class="cx"> fclose($tmpFile);
</span><span class="cx">
</span><span class="cx"> $filename = 'compass-no-cache.jpg';
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscacheresourcesreloadmainresourceiframephp"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/cache/resources/reload-main-resource-iframe.php (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/resources/reload-main-resource-iframe.php 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/cache/resources/reload-main-resource-iframe.php 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><del>-if (file_exists(sys_get_temp_dir() . "/reload-main-resource.tmp")) {
- unlink(sys_get_temp_dir() . "/reload-main-resource.tmp");
</del><ins>+if (file_exists(sys_get_temp_dir() . "/cache-reload-main-resource.tmp")) {
+ unlink(sys_get_temp_dir() . "/cache-reload-main-resource.tmp");
</ins><span class="cx"> echo "<body>";
</span><span class="cx"> echo "<script>";
</span><span class="cx"> echo "window.parent.finish();";
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> exit();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-$tmpFile = fopen(sys_get_temp_dir() . "/reload-main-resource.tmp", 'w');
</del><ins>+$tmpFile = fopen(sys_get_temp_dir() . "/cache-reload-main-resource.tmp", 'w');
</ins><span class="cx"> fclose($tmpFile);
</span><span class="cx">
</span><span class="cx"> $max_age = 12 * 31 * 24 * 60 * 60; //one year
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscachestoppedrevalidationhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/cache/stopped-revalidation.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/stopped-revalidation.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/cache/stopped-revalidation.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -5,15 +5,6 @@
</span><span class="cx"> testRunner.waitUntilDone();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function setNetworkEnabled(state)
-{
- var req = new XMLHttpRequest;
- req.open("GET", "/resources/network-simulator.php?command=" + (state ? "connect" : "disconnect"), false);
- req.send("");
-}
-
-setNetworkEnabled(true);
-
</del><span class="cx"> function test()
</span><span class="cx"> {
</span><span class="cx"> location='resources/stopped-revalidation-result.html';
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscachesubresourcefragmentidentifierhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/cache/subresource-fragment-identifier.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/subresource-fragment-identifier.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/cache/subresource-fragment-identifier.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> {
</span><span class="cx"> try {
</span><span class="cx"> var req = new XMLHttpRequest;
</span><del>- req.open("GET", "http://127.0.0.1:8000/resources/network-simulator.php?command=" + cmd, false);
</del><ins>+ req.open("GET", "http://127.0.0.1:8000/resources/network-simulator.php?test=cache-subresource-fragment-identifier&command=" + cmd, false);
</ins><span class="cx"> req.send(null);
</span><span class="cx"> return req.responseText;
</span><span class="cx"> } catch (ex) {
</span><span class="lines">@@ -41,18 +41,18 @@
</span><span class="cx">
</span><span class="cx"> <style>
</span><span class="cx"> div {
</span><del>- background-image: url('http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=bg_pattern.jpg#div');
</del><ins>+ 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');
</ins><span class="cx"> }
</span><span class="cx"> p {
</span><del>- background-image: url('http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=bg_pattern.jpg#p');
</del><ins>+ 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');
</ins><span class="cx"> }
</span><span class="cx"> </style>
</span><span class="cx">
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <div style="width: 100px; height: 100px;"></div>
</span><del>- <img src="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=bg_pattern.jpg#img1">
- <img src="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=bg_pattern.jpg#img2">
</del><ins>+ <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">
+ <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">
</ins><span class="cx">
</span><span class="cx"> Test that resources with fragment identifiers are loaded only once.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscssborderimageloadinghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/css/border-image-loading.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/css/border-image-loading.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/css/border-image-loading.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,17 +1,19 @@
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</span><ins>+ <!-- FIXME: This test relies on no preloading to happen before scripts run. -->
</ins><span class="cx"> <script src="resources/request-logging.js" type="text/javascript" charset="utf-8"></script>
</span><ins>+ <script>ResourceLogging.start("css-border-image-loading");</script>
</ins><span class="cx">
</span><span class="cx"> <style type="text/css">
</span><span class="cx"> .box {
</span><span class="cx"> height: 100px;
</span><span class="cx"> width: 100px;
</span><del>- -webkit-border-image: url("/resources/network-simulator.php?command=log-resource-request&path=border1.jpg") 10 10 10 10 stretch;
</del><ins>+ -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;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .bordered {
</span><del>- -webkit-border-image: url("/resources/network-simulator.php?command=log-resource-request&path=border2.jpg") 10 10 10 10 stretch;
</del><ins>+ -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;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscsscssimageloadinghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/css/css-image-loading.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/css/css-image-loading.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/css/css-image-loading.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,32 +1,34 @@
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</span><ins>+ <!-- FIXME: This test relies on no preloading to happen before scripts run. -->
</ins><span class="cx"> <script src="resources/request-logging.js" type="text/javascript" charset="utf-8"></script>
</span><ins>+ <script>ResourceLogging.start("css-css-image-loading");</script>
</ins><span class="cx">
</span><span class="cx"> <style type="text/css">
</span><span class="cx"> .box {
</span><span class="cx"> height: 100px;
</span><span class="cx"> width: 100px;
</span><del>- background-image: url("/resources/network-simulator.php?command=log-resource-request&path=background1.jpg");
</del><ins>+ background-image: url("/resources/network-simulator.php?test=css-css-image-loading&command=log-resource-request&path=background1.jpg");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .background {
</span><del>- background-image: url("/resources/network-simulator.php?command=log-resource-request&path=background2.jpg");
</del><ins>+ background-image: url("/resources/network-simulator.php?test=css-css-image-loading&command=log-resource-request&path=background2.jpg");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .content {
</span><del>- content: url("/resources/network-simulator.php?command=log-resource-request&path=content-image1.jpg");
</del><ins>+ content: url("/resources/network-simulator.php?test=css-css-image-loading&command=log-resource-request&path=content-image1.jpg");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .test {
</span><del>- 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");
</del><ins>+ 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");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ul {
</span><del>- list-style-image: url("/resources/network-simulator.php?command=log-resource-request&path=list-image1.jpg");
</del><ins>+ list-style-image: url("/resources/network-simulator.php?test=css-css-image-loading&command=log-resource-request&path=list-image1.jpg");
</ins><span class="cx"> }
</span><span class="cx"> .list {
</span><del>- list-style-image: url("/resources/network-simulator.php?command=log-resource-request&path=list-image2.jpg");
</del><ins>+ list-style-image: url("/resources/network-simulator.php?test=css-css-image-loading&command=log-resource-request&path=list-image2.jpg");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscssmaskimageloadinghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/css/mask-image-loading.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/css/mask-image-loading.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/css/mask-image-loading.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,17 +1,19 @@
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</span><ins>+ <!-- FIXME: This test relies on no preloading to happen before scripts run. -->
</ins><span class="cx"> <script src="resources/request-logging.js" type="text/javascript" charset="utf-8"></script>
</span><ins>+ <script>ResourceLogging.start("css-mask-image-loading");</script>
</ins><span class="cx">
</span><span class="cx"> <style type="text/css">
</span><span class="cx"> .box {
</span><span class="cx"> height: 100px;
</span><span class="cx"> width: 100px;
</span><del>- -webkit-mask-box-image: url("/resources/network-simulator.php?command=log-resource-request&path=mask1.jpg");
</del><ins>+ -webkit-mask-box-image: url("/resources/network-simulator.php?test=css-mask-image-loading&command=log-resource-request&path=mask1.jpg");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .masked {
</span><del>- -webkit-mask-box-image: url("/resources/network-simulator.php?command=log-resource-request&path=mask2.jpg");
</del><ins>+ -webkit-mask-box-image: url("/resources/network-simulator.php?test=css-mask-image-loading&command=log-resource-request&path=mask2.jpg");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscssreflectionmaskimageloadinghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/css/reflection-mask-image-loading.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/css/reflection-mask-image-loading.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/css/reflection-mask-image-loading.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,17 +1,19 @@
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</span><ins>+ <!-- FIXME: This test relies on no preloading to happen before scripts run. -->
</ins><span class="cx"> <script src="resources/request-logging.js" type="text/javascript" charset="utf-8"></script>
</span><ins>+ <script>ResourceLogging.start("css-refleciton-mask-image-loading");</script>
</ins><span class="cx">
</span><span class="cx"> <style type="text/css">
</span><span class="cx"> .box {
</span><span class="cx"> height: 100px;
</span><span class="cx"> width: 100px;
</span><del>- -webkit-box-reflect: below 10px url("/resources/network-simulator.php?command=log-resource-request&path=mask1.jpg");
</del><ins>+ -webkit-box-reflect: below 10px url("/resources/network-simulator.php?test=css-refleciton-mask-image-loading&command=log-resource-request&path=mask1.jpg");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .reflected {
</span><del>- -webkit-box-reflect: below 10px url("/resources/network-simulator.php?command=log-resource-request&path=mask2.jpg");
</del><ins>+ -webkit-box-reflect: below 10px url("/resources/network-simulator.php?test=css-refleciton-mask-image-loading&command=log-resource-request&path=mask2.jpg");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscssresourcesrequestloggingjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/css/resources/request-logging.js (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/css/resources/request-logging.js 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/css/resources/request-logging.js 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,41 +1,47 @@
</span><del>-function CallCommand(cmd)
-{
- try {
- var req = new XMLHttpRequest;
- req.open("GET", "/resources/network-simulator.php?command=" + cmd, false);
- req.send(null);
- return req.responseText;
- } catch (ex) {
- return "";
- }
-}
</del><ins>+var ResourceLogging = {
+ CallCommand: function(cmd)
+ {
+ try {
+ var req = new XMLHttpRequest;
+ req.open("GET", "/resources/network-simulator.php?test=" + this.testName + "&command=" + cmd, false);
+ req.send(null);
+ return req.responseText;
+ } catch (ex) {
+ return "";
+ }
+ },
</ins><span class="cx">
</span><del>-function startTest()
-{
- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
- }
</del><ins>+ startTest: function()
+ {
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
</ins><span class="cx">
</span><del>- window.setTimeout(endTest, 0);
-}
</del><ins>+ window.setTimeout(this.endTest.bind(this), 0);
+ },
</ins><span class="cx">
</span><del>-function endTest()
-{
- getResourceLog();
- CallCommand("clear-resource-request-log");
</del><ins>+ endTest: function()
+ {
+ this.getResourceLog();
+ this.CallCommand("clear-resource-request-log");
</ins><span class="cx">
</span><del>- if (window.testRunner)
- testRunner.notifyDone();
-}
</del><ins>+ if (window.testRunner)
+ testRunner.notifyDone();
+ },
</ins><span class="cx">
</span><del>-function getResourceLog()
-{
- var log = CallCommand("get-resource-request-log");
- var logLines = log.split('\n');
- logLines.sort();
- document.getElementById('result').innerText = logLines.join('\n');
-}
</del><ins>+ getResourceLog: function()
+ {
+ var log = this.CallCommand("get-resource-request-log");
+ var logLines = log.split('\n');
+ logLines.sort();
+ document.getElementById('result').innerText = logLines.join('\n');
+ },
</ins><span class="cx">
</span><del>-CallCommand("start-resource-request-log");
-window.addEventListener('load', startTest, false);
</del><ins>+ start: function(testName)
+ {
+ this.testName = testName;
+ this.CallCommand("start-resource-request-log");
+ window.addEventListener('load', this.startTest.bind(this), false);
+ },
+};
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsloadingpreloadimgtesthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/loading/preload-img-test.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/loading/preload-img-test.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/loading/preload-img-test.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> {
</span><span class="cx"> try {
</span><span class="cx"> var req = new XMLHttpRequest;
</span><del>- req.open("GET", "/resources/network-simulator.php?command=" + cmd, false);
</del><ins>+ req.open("GET", "/resources/network-simulator.php?test=loading-preload-img-test&command=" + cmd, false);
</ins><span class="cx"> req.send(null);
</span><span class="cx"> return req.responseText;
</span><span class="cx"> } catch (ex) {
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> <script type="text/javascript" src="./resources/empty.js"></script>
</span><span class="cx"> </head>
</span><span class="cx"> <body onload="test()">
</span><del>- <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)">
</del><ins>+ <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)">
</ins><span class="cx"> <p>This test is to test whether preload image will require 2 more requests or not.</p>
</span><span class="cx"> <span id="outputPanel">PASSED</span>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkLayoutTestshttptestslocallinkstylesheetloadorderpreloadhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/local/link-stylesheet-load-order-preload.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/local/link-stylesheet-load-order-preload.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/local/link-stylesheet-load-order-preload.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> {
</span><span class="cx"> try {
</span><span class="cx"> var req = new XMLHttpRequest;
</span><del>- req.open("GET", "http://127.0.0.1:8000/resources/network-simulator.php?command=" + cmd, false);
</del><ins>+ req.open("GET", "http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order-preload&command=" + cmd, false);
</ins><span class="cx"> req.send(null);
</span><span class="cx"> return req.responseText;
</span><span class="cx"> } catch (ex) {
</span><span class="lines">@@ -43,35 +43,35 @@
</span><span class="cx"> </script>
</span><span class="cx">
</span><span class="cx"> <!-- This will trigger the preload scanner -->
</span><del>- <script src="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=script.js"></script>
</del><ins>+ <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>
</ins><span class="cx">
</span><del>- <link rel=stylesheet href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=no-media.css">
- <link rel=stylesheet media="" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-empty.css">
- <link rel=stylesheet media="all" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-all.css">
- <link rel=stylesheet media="print" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-print.css">
- <link rel=stylesheet media="screen" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-screen.css">
- <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">
- <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">
- <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">
- <link rel=stylesheet media="aural" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-aural.css">
- <link rel=stylesheet media="braille" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-braille.css">
- <link rel=stylesheet media="handheld" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=median-handheld.css">
- <link rel=stylesheet media="projection" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-projection.css">
- <link rel=stylesheet media="tty" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-tty.css">
- <link rel=stylesheet media="tv" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-tv.css">
- <link rel=stylesheet href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=no-media-2.css">
- <link rel=stylesheet media="" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-empty-2.css">
- <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">
- <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">
- <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">
- <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">
- <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">
- <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">
</del><ins>+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
</ins><span class="cx">
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>- <img src="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=image.jpg">
- <script src="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=script-2.js"></script>
</del><ins>+ <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">
+ <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>
</ins><span class="cx">
</span><span class="cx"> Test stylesheet load scheduling with preload scanner. Resource loads for screen stylesheets should be scheduled first, others should be scheduled last.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestslocallinkstylesheetloadorderhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/local/link-stylesheet-load-order.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/local/link-stylesheet-load-order.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/local/link-stylesheet-load-order.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> {
</span><span class="cx"> try {
</span><span class="cx"> var req = new XMLHttpRequest;
</span><del>- req.open("GET", "http://127.0.0.1:8000/resources/network-simulator.php?command=" + cmd, false);
</del><ins>+ req.open("GET", "http://127.0.0.1:8000/resources/network-simulator.php?test=loading-link-stylesheet-load-order&command=" + cmd, false);
</ins><span class="cx"> req.send(null);
</span><span class="cx"> return req.responseText;
</span><span class="cx"> } catch (ex) {
</span><span class="lines">@@ -42,33 +42,33 @@
</span><span class="cx"> window.addEventListener('load', endTest, false);
</span><span class="cx"> </script>
</span><span class="cx">
</span><del>- <link rel=stylesheet href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=no-media.css">
- <link rel=stylesheet media="" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-empty.css">
- <link rel=stylesheet media="all" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-all.css">
- <link rel=stylesheet media="print" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-print.css">
- <link rel=stylesheet media="screen" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-screen.css">
- <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">
- <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">
- <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">
- <link rel=stylesheet media="aural" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-aural.css">
- <link rel=stylesheet media="braille" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-braille.css">
- <link rel=stylesheet media="handheld" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=median-handheld.css">
- <link rel=stylesheet media="projection" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-projection.css">
- <link rel=stylesheet media="tty" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-tty.css">
- <link rel=stylesheet media="tv" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-tv.css">
- <link rel=stylesheet href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=no-media-2.css">
- <link rel=stylesheet media="" href="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=media-empty-2.css">
- <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">
- <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">
- <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">
- <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">
- <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">
- <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">
</del><ins>+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
+ <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">
</ins><span class="cx">
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>- <img src="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=image.jpg">
- <script src="http://127.0.0.1:8000/resources/network-simulator.php?command=log-resource-request&path=script.js"></script>
</del><ins>+ <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">
+ <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>
</ins><span class="cx">
</span><span class="cx"> Test stylesheet load scheduling. Resource loads for screen stylesheets should be scheduled first, others should be scheduled last.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsmisclinkrelprefetchandsubresourcehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/misc/link-rel-prefetch-and-subresource.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/misc/link-rel-prefetch-and-subresource.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/misc/link-rel-prefetch-and-subresource.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> {
</span><span class="cx"> try {
</span><span class="cx"> var req = new XMLHttpRequest;
</span><del>- req.open("GET", "/resources/network-simulator.php?command=" + cmd, false);
</del><ins>+ req.open("GET", "/resources/network-simulator.php?test=misc-link-rel-prefetch-and-subresource&command=" + cmd, false);
</ins><span class="cx"> req.send(null);
</span><span class="cx"> return req.responseText;
</span><span class="cx"> } catch (ex) {
</span><span class="lines">@@ -57,11 +57,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> </script>
</span><del>- <link rel=prefetch onload="decrementLinkLoadCount()" href="/resources/network-simulator.php?command=log-resource-request&path=1st.jpg">
- <link rel=subresource onload="decrementLinkLoadCount()" href="/resources/network-simulator.php?command=log-resource-request&path=2nd.jpg">
- <link rel=prefetch onload="decrementLinkLoadCount()" href="/resources/network-simulator.php?command=log-resource-request&path=3rd.jpg">
- <link rel=prefetch onload="decrementLinkLoadCount()" href="/resources/network-simulator.php?command=log-resource-request&path=4th.jpg">
- <link rel=subresource onload="decrementLinkLoadCount()" href="/resources/network-simulator.php?command=log-resource-request&path=5th.jpg">
</del><ins>+ <link rel=prefetch onload="decrementLinkLoadCount()" href="/resources/network-simulator.php?test=misc-link-rel-prefetch-and-subresource&command=log-resource-request&path=1st.jpg">
+ <link rel=subresource onload="decrementLinkLoadCount()" href="/resources/network-simulator.php?test=misc-link-rel-prefetch-and-subresource&command=log-resource-request&path=2nd.jpg">
+ <link rel=prefetch onload="decrementLinkLoadCount()" href="/resources/network-simulator.php?test=misc-link-rel-prefetch-and-subresource&command=log-resource-request&path=3rd.jpg">
+ <link rel=prefetch onload="decrementLinkLoadCount()" href="/resources/network-simulator.php?test=misc-link-rel-prefetch-and-subresource&command=log-resource-request&path=4th.jpg">
+ <link rel=subresource onload="decrementLinkLoadCount()" href="/resources/network-simulator.php?test=misc-link-rel-prefetch-and-subresource&command=log-resource-request&path=5th.jpg">
</ins><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsresourcesnetworksimulatorphp"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/resources/network-simulator.php (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/resources/network-simulator.php 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/resources/network-simulator.php 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -5,10 +5,22 @@
</span><span class="cx"> // offline, it simulates a network error with a nonsense response.
</span><span class="cx">
</span><span class="cx"> if (!sys_get_temp_dir()) {
</span><ins>+ header("HTTP/1.1 500 Internal Server Error");
</ins><span class="cx"> echo "FAIL: No temp dir was returned.\n";
</span><span class="cx"> exit();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+if (!isset($_GET['test'])) {
+ header("HTTP/1.1 500 Internal Server Error");
+ echo "test parameter must be specified for a unique test name\n";
+ exit();
+}
+
+function tempPathBase()
+{
+ return sys_get_temp_dir() . "/" . $_GET['test'];
+}
+
</ins><span class="cx"> function setState($newState, $file)
</span><span class="cx"> {
</span><span class="cx"> file_put_contents($file, $newState);
</span><span class="lines">@@ -89,7 +101,7 @@
</span><span class="cx">
</span><span class="cx"> function handleIncreaseResourceCountCommand($path)
</span><span class="cx"> {
</span><del>- $resourceCountFile = sys_get_temp_dir() . "/resource-count";
</del><ins>+ $resourceCountFile = tempPathBase() . "-count";
</ins><span class="cx"> $resourceCount = getState($resourceCountFile);
</span><span class="cx"> $pieces = explode(" ", $resourceCount);
</span><span class="cx"> $count = 0;
</span><span class="lines">@@ -104,7 +116,7 @@
</span><span class="cx">
</span><span class="cx"> function handleResetResourceCountCommand()
</span><span class="cx"> {
</span><del>- $resourceCountFile = sys_get_temp_dir() . "/resource-count";
</del><ins>+ $resourceCountFile = tempPathBase() . "-count";
</ins><span class="cx"> file_put_contents($resourceCountFile, 0);
</span><span class="cx"> generateNoCacheHTTPHeader();
</span><span class="cx"> header('HTTP/1.1 200 OK');
</span><span class="lines">@@ -112,7 +124,7 @@
</span><span class="cx">
</span><span class="cx"> function handleGetResourceCountCommand($path)
</span><span class="cx"> {
</span><del>- $resourceCountFile = sys_get_temp_dir() . "/resource-count";
</del><ins>+ $resourceCountFile = tempPathBase() . "-count";
</ins><span class="cx"> $resourceCount = getState($resourceCountFile);
</span><span class="cx"> $pieces = explode(" ", $resourceCount);
</span><span class="cx"> generateNoCacheHTTPHeader();
</span><span class="lines">@@ -126,19 +138,19 @@
</span><span class="cx">
</span><span class="cx"> function handleStartResourceRequestsLog()
</span><span class="cx"> {
</span><del>- $resourceLogFile = sys_get_temp_dir() . "/resource-log";
</del><ins>+ $resourceLogFile = tempPathBase() . "-log";
</ins><span class="cx"> file_put_contents($resourceLogFile, "");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function handleClearResourceRequestsLog()
</span><span class="cx"> {
</span><del>- $resourceLogFile = sys_get_temp_dir() . "/resource-log";
</del><ins>+ $resourceLogFile = tempPathBase() . "-log";
</ins><span class="cx"> file_put_contents($resourceLogFile, "");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function handleGetResourceRequestsLog()
</span><span class="cx"> {
</span><del>- $resourceLogFile = sys_get_temp_dir() . "/resource-log";
</del><ins>+ $resourceLogFile = tempPathBase() . "-log";
</ins><span class="cx">
</span><span class="cx"> generateNoCacheHTTPHeader();
</span><span class="cx"> header("Content-Type: text/plain");
</span><span class="lines">@@ -148,14 +160,14 @@
</span><span class="cx">
</span><span class="cx"> function handleLogResourceRequest($path)
</span><span class="cx"> {
</span><del>- $resourceLogFile = sys_get_temp_dir() . "/resource-log";
</del><ins>+ $resourceLogFile = tempPathBase() . "-log";
</ins><span class="cx">
</span><span class="cx"> $newData = "\n".$path;
</span><span class="cx"> // Documentation says that appends are atomic.
</span><span class="cx"> file_put_contents($resourceLogFile, $newData, FILE_APPEND);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-$stateFile = sys_get_temp_dir() . "/network-simulator-state";
</del><ins>+$stateFile = tempPathBase() . "-state";
</ins><span class="cx"> $command = $_GET['command'];
</span><span class="cx"> if ($command) {
</span><span class="cx"> if ($command == "connect")
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsresourcestripminephp"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/http/tests/resources/tripmine.php (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/resources/tripmine.php 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/resources/tripmine.php 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,63 +0,0 @@
</span><del>-<?php
-require_once 'portabilityLayer.php';
-
-// This script detects requests that could not be sent before cross-site XMLHttpRequest appeared.
-
-header("Expires: Thu, 01 Dec 2003 16:00:00 GMT");
-header("Cache-Control: no-cache, no-store, must-revalidate");
-header("Pragma: no-cache");
-
-if (!sys_get_temp_dir()) {
- echo "FAIL: No temp dir was returned.\n";
- exit();
-}
-
-function setState($newState, $file)
-{
- file_put_contents($file, $newState);
-}
-
-function getState($file)
-{
- if (!file_exists($file)) {
- return "";
- }
- return file_get_contents($file);
-}
-
-$stateFile = sys_get_temp_dir() . "/tripmine-status";
-$command = $_GET['command'];
-if ($command) {
- if ($command == "status")
- echo getState($stateFile);
- exit();
-}
-
-$method = $_SERVER['REQUEST_METHOD'];
-$contentType = $_SERVER['CONTENT_TYPE'];
-
-if ($method == "OPTIONS") {
- // Don't allow cross-site requests with preflight.
- exit();
-}
-
-// Only allow simple cross-site requests - since we did not allow preflight, this is all we should ever get.
-
-if ($method != "GET" && $method != "HEAD" && $method != "POST") {
- setState("FAIL. Non-simple method $method.", $stateFile);
- exit();
-}
-
-if (isset($contentType)
- && !preg_match("/^application\/x\-www\-form\-urlencoded(;.+)?$/", $contentType)
- && !preg_match("/^multipart\/form\-data(;.+)?$/", $contentType)
- && !preg_match("/^text\/plain(;.+)?$/", $contentType)) {
- setState("FAIL. Non-simple content type: $contentType.", $stateFile);
- exit();
-}
-
-if (isset($_SERVER['HTTP_X_WEBKIT_TEST'])) {
- setState("FAIL. Custom header sent with a simple request.", $stateFile);
- exit();
-}
-?>
</del></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestaccesscontrolpreflightasyncheaderdeniedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-header-denied-expected.txt (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-header-denied-expected.txt 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-header-denied-expected.txt 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-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.
</del><ins>+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-async-header-denied&state=header. Request header field X-NON-STANDARD is not allowed by Access-Control-Allow-Headers.
</ins><span class="cx"> PASS: Request successfully blocked.
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestaccesscontrolpreflightasyncheaderdeniedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-header-denied.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-header-denied.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-header-denied.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> var xhr = new XMLHttpRequest();
</span><span class="cx">
</span><span class="cx"> try {
</span><del>- xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=reset", false);
</del><ins>+ xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-async-header-denied&state=reset", false);
</ins><span class="cx"> xhr.send(null);
</span><span class="cx"> } catch(e) {
</span><span class="cx"> log("FAIL: Unable to reset server state: [" + e.message + "].");
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> xhr = new XMLHttpRequest();
</span><span class="cx">
</span><span class="cx"> try {
</span><del>- xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=header", true);
</del><ins>+ xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-async-header-denied&state=header", true);
</ins><span class="cx"> xhr.setRequestHeader("X-NON-STANDARD", "filler");
</span><span class="cx"> } catch(e) {
</span><span class="cx"> log("FAIL: Exception thrown. Cross-domain access is not allowed in first 'open'. [" + e.message + "].");
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> xhr = new XMLHttpRequest();
</span><span class="cx">
</span><span class="cx"> try {
</span><del>- xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=complete", false);
</del><ins>+ xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-async-header-denied&state=complete", false);
</ins><span class="cx"> try {
</span><span class="cx"> xhr.send(null);
</span><span class="cx"> } catch(e) {
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestaccesscontrolpreflightasyncmethoddeniedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-method-denied-expected.txt (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-method-denied-expected.txt 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-method-denied-expected.txt 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-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.
</del><ins>+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-async-method-denied&state=method. Method DELETE is not allowed by Access-Control-Allow-Methods.
</ins><span class="cx"> PASS: Request successfully blocked.
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestaccesscontrolpreflightasyncmethoddeniedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-method-denied.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-method-denied.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-method-denied.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> var xhr = new XMLHttpRequest();
</span><span class="cx">
</span><span class="cx"> try {
</span><del>- xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=reset", false);
</del><ins>+ xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-async-method-denied&state=reset", false);
</ins><span class="cx"> xhr.send(null);
</span><span class="cx"> } catch(e) {
</span><span class="cx"> log("FAIL: Unable to reset server state: [" + e.message + "].");
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> xhr = new XMLHttpRequest();
</span><span class="cx">
</span><span class="cx"> try {
</span><del>- xhr.open("DELETE", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=method", true);
</del><ins>+ xhr.open("DELETE", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-async-method-denied&state=method", true);
</ins><span class="cx"> } catch(e) {
</span><span class="cx"> log("FAIL: Exception thrown. Cross-domain access is not allowed in first 'open'. [" + e.message + "].");
</span><span class="cx"> return;
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> xhr = new XMLHttpRequest();
</span><span class="cx">
</span><span class="cx"> try {
</span><del>- xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=complete", false);
</del><ins>+ xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-async-method-denied&state=complete", false);
</ins><span class="cx"> try {
</span><span class="cx"> xhr.send(null);
</span><span class="cx"> } catch(e) {
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestaccesscontrolpreflightasyncnotsupportedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-not-supported-expected.txt (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-not-supported-expected.txt 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-not-supported-expected.txt 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-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.
</del><ins>+CONSOLE MESSAGE: XMLHttpRequest cannot load http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-async-non-supported. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin.
</ins><span class="cx"> PASS: Request successfully blocked.
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestaccesscontrolpreflightasyncnotsupportedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-not-supported.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-not-supported.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-async-not-supported.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> var xhr = new XMLHttpRequest();
</span><span class="cx">
</span><span class="cx"> try {
</span><del>- xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=reset", false);
</del><ins>+ xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-async-non-supported&state=reset", false);
</ins><span class="cx"> xhr.send(null);
</span><span class="cx"> } catch(e) {
</span><span class="cx"> log("FAIL: Unable to reset server state: [" + e.message + "].");
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> xhr = new XMLHttpRequest();
</span><span class="cx">
</span><span class="cx"> try {
</span><del>- xhr.open("PUT", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php", true);
</del><ins>+ xhr.open("PUT", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-async-non-supported", true);
</ins><span class="cx"> } catch(e) {
</span><span class="cx"> log("FAIL: Exception thrown. Cross-domain access is not allowed in first 'open'. [" + e.message + "].");
</span><span class="cx"> return;
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> xhr = new XMLHttpRequest();
</span><span class="cx">
</span><span class="cx"> try {
</span><del>- xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=complete", false);
</del><ins>+ xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-async-non-supported&state=complete", false);
</ins><span class="cx"> try {
</span><span class="cx"> xhr.send(null);
</span><span class="cx"> } catch(e) {
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestaccesscontrolpreflightheadersasynchtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-headers-async.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-headers-async.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-headers-async.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -8,14 +8,14 @@
</span><span class="cx"> function resetStatus()
</span><span class="cx"> {
</span><span class="cx"> var req = new XMLHttpRequest;
</span><del>- req.open("GET", "/resources/reset-temp-file.php?filename=access-control-preflight-headers-status", false);
</del><ins>+ req.open("GET", "/resources/reset-temp-file.php?filename=access-control-preflight-headers-async-status", false);
</ins><span class="cx"> req.send();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function sendRequest()
</span><span class="cx"> {
</span><span class="cx"> var req = new XMLHttpRequest;
</span><del>- req.open("GET", "http://localhost:8000/xmlhttprequest/resources/no-custom-header.php");
</del><ins>+ req.open("GET", "http://localhost:8000/xmlhttprequest/resources/no-custom-header.php?filename=access-control-preflight-headers-async-status");
</ins><span class="cx"> req.setRequestHeader("X-Custom-Header", "foobar");
</span><span class="cx"> req.onerror = function() {
</span><span class="cx"> document.body.appendChild(document.createTextNode("FAIL: onerror called"));
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestaccesscontrolpreflightheaderssynchtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-headers-sync.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-headers-sync.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-headers-sync.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> function resetStatus()
</span><span class="cx"> {
</span><span class="cx"> var req = new XMLHttpRequest;
</span><del>- req.open("GET", "/resources/reset-temp-file.php?filename=access-control-preflight-headers-status", false);
</del><ins>+ req.open("GET", "/resources/reset-temp-file.php?filename=access-control-preflight-headers-sync-status", false);
</ins><span class="cx"> req.send();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> {
</span><span class="cx"> try {
</span><span class="cx"> var req = new XMLHttpRequest;
</span><del>- req.open("GET", "http://localhost:8000/xmlhttprequest/resources/no-custom-header.php", false);
</del><ins>+ req.open("GET", "http://localhost:8000/xmlhttprequest/resources/no-custom-header.php?filename=access-control-preflight-headers-sync-status", false);
</ins><span class="cx"> req.setRequestHeader("X-Custom-Header", "foobar");
</span><span class="cx"> req.send();
</span><span class="cx"> document.write("<xmp>" + req.responseText + "</xmp>");
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestaccesscontrolpreflightsyncheaderdeniedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-header-denied-expected.txt (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-header-denied-expected.txt 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-header-denied-expected.txt 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-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.
</del><ins>+CONSOLE 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.
</ins><span class="cx"> PASS: Request successfully blocked.
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestaccesscontrolpreflightsyncheaderdeniedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-header-denied.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-header-denied.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-header-denied.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> var xhr = new XMLHttpRequest();
</span><span class="cx">
</span><span class="cx"> try {
</span><del>- xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=reset", false);
</del><ins>+ xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-sync-header-denied&state=reset", false);
</ins><span class="cx"> xhr.send(null);
</span><span class="cx"> } catch(e) {
</span><span class="cx"> log("FAIL: Unable to reset server state: [" + e.message + "].");
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> xhr = new XMLHttpRequest();
</span><span class="cx">
</span><span class="cx"> try {
</span><del>- xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=header", false);
</del><ins>+ xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-sync-header-denied&state=header", false);
</ins><span class="cx"> xhr.setRequestHeader("X-NON-STANDARD", "filler");
</span><span class="cx"> } catch(e) {
</span><span class="cx"> log("FAIL: Exception thrown. Cross-domain access is not allowed in first 'open'. [" + e.message + "].");
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> xhr = new XMLHttpRequest();
</span><span class="cx">
</span><span class="cx"> try {
</span><del>- xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=complete", false);
</del><ins>+ xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-sync-header-denied&state=complete", false);
</ins><span class="cx"> } catch(e) {
</span><span class="cx"> log("FAIL: Exception thrown. Cross-domain access is not allowed in second 'open'. [" + e.message + "].");
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestaccesscontrolpreflightsyncmethoddeniedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-method-denied-expected.txt (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-method-denied-expected.txt 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-method-denied-expected.txt 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-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.
</del><ins>+CONSOLE 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.
</ins><span class="cx"> PASS: Request successfully blocked.
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestaccesscontrolpreflightsyncmethoddeniedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-method-denied.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-method-denied.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-method-denied.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> var xhr = new XMLHttpRequest();
</span><span class="cx">
</span><span class="cx"> try {
</span><del>- xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=reset", false);
</del><ins>+ xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-sync-method-denied&state=reset", false);
</ins><span class="cx"> xhr.send(null);
</span><span class="cx"> } catch(e) {
</span><span class="cx"> log("FAIL: Unable to reset server state: [" + e.message + "].");
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> xhr = new XMLHttpRequest();
</span><span class="cx">
</span><span class="cx"> try {
</span><del>- xhr.open("DELETE", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=method", false);
</del><ins>+ xhr.open("DELETE", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-sync-method-denied&state=method", false);
</ins><span class="cx"> } catch(e) {
</span><span class="cx"> log("FAIL: Exception thrown. Cross-domain access is not allowed in first 'open'. [" + e.message + "].");
</span><span class="cx"> return;
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> xhr = new XMLHttpRequest();
</span><span class="cx">
</span><span class="cx"> try {
</span><del>- xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=complete", false);
</del><ins>+ xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-sync-method-denied&state=complete", false);
</ins><span class="cx"> } catch(e) {
</span><span class="cx"> log("FAIL: Exception thrown. Cross-domain access is not allowed in second 'open'. [" + e.message + "].");
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestaccesscontrolpreflightsyncnotsupportedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-not-supported-expected.txt (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-not-supported-expected.txt 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-not-supported-expected.txt 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-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.
</del><ins>+CONSOLE 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.
</ins><span class="cx"> PASS: Request successfully blocked.
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestaccesscontrolpreflightsyncnotsupportedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-not-supported.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-not-supported.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/access-control-preflight-sync-not-supported.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> var xhr = new XMLHttpRequest();
</span><span class="cx">
</span><span class="cx"> try {
</span><del>- xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=reset", false);
</del><ins>+ xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-sync-non-supported&state=reset", false);
</ins><span class="cx"> xhr.send(null);
</span><span class="cx"> } catch(e) {
</span><span class="cx"> log("FAIL: Unable to reset server state: [" + e.message + "].");
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> xhr = new XMLHttpRequest();
</span><span class="cx">
</span><span class="cx"> try {
</span><del>- xhr.open("PUT", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php", false);
</del><ins>+ xhr.open("PUT", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-sync-non-supported", false);
</ins><span class="cx"> } catch(e) {
</span><span class="cx"> log("FAIL: Exception thrown. Cross-domain access is not allowed in first 'open'. [" + e.message + "].");
</span><span class="cx"> return;
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> xhr = new XMLHttpRequest();
</span><span class="cx">
</span><span class="cx"> try {
</span><del>- xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?state=complete", false);
</del><ins>+ xhr.open("GET", "http://localhost:8000/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php?test=access-control-preflight-sync-non-supported&state=complete", false);
</ins><span class="cx"> } catch(e) {
</span><span class="cx"> log("FAIL: Exception thrown. Cross-domain access is not allowed in second 'open'. [" + e.message + "].");
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestredirectcrossorigintripminehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-tripmine.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-tripmine.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/redirect-cross-origin-tripmine.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -14,14 +14,14 @@
</span><span class="cx"> function resetTripmine()
</span><span class="cx"> {
</span><span class="cx"> var req = new XMLHttpRequest;
</span><del>- req.open("GET", "/resources/reset-temp-file.php?filename=tripmine-status", false);
</del><ins>+ req.open("GET", "/resources/reset-temp-file.php?filename=xmlhttprequest-redirect-cross-origin-tripmine_status", false);
</ins><span class="cx"> req.send();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function tripmineStatus()
</span><span class="cx"> {
</span><span class="cx"> var req = new XMLHttpRequest;
</span><del>- req.open("GET", "/resources/tripmine.php?command=status", false);
</del><ins>+ req.open("GET", "resources/redirect-cross-origin-tripmine.php?command=status", false);
</ins><span class="cx"> req.send();
</span><span class="cx"> return req.responseText;
</span><span class="cx"> }
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> resetTripmine();
</span><span class="cx">
</span><span class="cx"> var req = new XMLHttpRequest;
</span><del>- req.open(method, "/resources/redirect.php?code=" + code + "&url=http://localhost:8000/resources/tripmine.php", true);
</del><ins>+ req.open(method, "/resources/redirect.php?code=" + code + "&url=http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php", true);
</ins><span class="cx"> req.setRequestHeader("X-WebKit-Test", "*");
</span><span class="cx"> req.setRequestHeader("Content-Type", "application/xml");
</span><span class="cx"> req.send("data");
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> resetTripmine();
</span><span class="cx">
</span><span class="cx"> var req = new XMLHttpRequest;
</span><del>- req.open(method, "/resources/redirect.php?code=" + code + "&url=http://localhost:8000/resources/tripmine.php", false);
</del><ins>+ req.open(method, "/resources/redirect.php?code=" + code + "&url=http://localhost:8000/xmlhttprequest/resources/redirect-cross-origin-tripmine.php", false);
</ins><span class="cx"> req.setRequestHeader("X-WebKit-Test", "*");
</span><span class="cx"> req.setRequestHeader("Content-Type", "application/xml");
</span><span class="cx"> try {
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestresourcesaccesscontrolpreflightdeniedxsrfphp"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/resources/access-control-preflight-denied-xsrf.php 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> require_once '../../resources/portabilityLayer.php';
</span><span class="cx">
</span><del>-$tmpFile = sys_get_temp_dir() . "/xsrf.txt";
</del><ins>+$tmpFile = sys_get_temp_dir() . "/" . $_GET["test"];
</ins><span class="cx">
</span><span class="cx"> function fail($state)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestresourcesnocustomheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/xmlhttprequest/resources/no-custom-header.php (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/resources/no-custom-header.php 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/resources/no-custom-header.php 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> require_once '../../resources/portabilityLayer.php';
</span><span class="cx">
</span><del>-$stateFile = sys_get_temp_dir() . "/access-control-preflight-headers-status";
</del><ins>+$stateFile = sys_get_temp_dir() . "/" . $_GET['filename'];
</ins><span class="cx">
</span><span class="cx"> function setState($newState, $file)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestresourcesredirectcrossorigintripminephpfromrev175731trunkLayoutTestshttptestsresourcestripminephp"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/http/tests/xmlhttprequest/resources/redirect-cross-origin-tripmine.php (from rev 175731, trunk/LayoutTests/http/tests/resources/tripmine.php) (0 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/resources/redirect-cross-origin-tripmine.php (rev 0)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/resources/redirect-cross-origin-tripmine.php 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -0,0 +1,63 @@
</span><ins>+<?php
+require_once '../../resources/portabilityLayer.php';
+
+// This script detects requests that could not be sent before cross-site XMLHttpRequest appeared.
+
+header("Expires: Thu, 01 Dec 2003 16:00:00 GMT");
+header("Cache-Control: no-cache, no-store, must-revalidate");
+header("Pragma: no-cache");
+
+if (!sys_get_temp_dir()) {
+ echo "FAIL: No temp dir was returned.\n";
+ exit();
+}
+
+function setState($newState, $file)
+{
+ file_put_contents($file, $newState);
+}
+
+function getState($file)
+{
+ if (!file_exists($file)) {
+ return "";
+ }
+ return file_get_contents($file);
+}
+
+$stateFile = sys_get_temp_dir() . "/xmlhttprequest-redirect-cross-origin-tripmine_status";
+$command = $_GET['command'];
+if ($command) {
+ if ($command == "status")
+ echo getState($stateFile);
+ exit();
+}
+
+$method = $_SERVER['REQUEST_METHOD'];
+$contentType = $_SERVER['CONTENT_TYPE'];
+
+if ($method == "OPTIONS") {
+ // Don't allow cross-site requests with preflight.
+ exit();
+}
+
+// Only allow simple cross-site requests - since we did not allow preflight, this is all we should ever get.
+
+if ($method != "GET" && $method != "HEAD" && $method != "POST") {
+ setState("FAIL. Non-simple method $method.", $stateFile);
+ exit();
+}
+
+if (isset($contentType)
+ && !preg_match("/^application\/x\-www\-form\-urlencoded(;.+)?$/", $contentType)
+ && !preg_match("/^multipart\/form\-data(;.+)?$/", $contentType)
+ && !preg_match("/^text\/plain(;.+)?$/", $contentType)) {
+ setState("FAIL. Non-simple content type: $contentType.", $stateFile);
+ exit();
+}
+
+if (isset($_SERVER['HTTP_X_WEBKIT_TEST'])) {
+ setState("FAIL. Custom header sent with a simple request.", $stateFile);
+ exit();
+}
+?>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequeststateafternetworkerrorhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/xmlhttprequest/state-after-network-error.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/state-after-network-error.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/state-after-network-error.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> function setNetworkEnabled(state)
</span><span class="cx"> {
</span><span class="cx"> var req = new XMLHttpRequest;
</span><del>- req.open("GET", "/resources/network-simulator.php?command=" + (state ? "connect" : "disconnect"), false);
</del><ins>+ req.open("GET", "/resources/network-simulator.php?test=xmlhttprequest-state-after-network-error&command=" + (state ? "connect" : "disconnect"), false);
</ins><span class="cx"> req.send("");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> setNetworkEnabled(false);
</span><span class="cx"> var xhr = new XMLHttpRequest();
</span><span class="cx"> xhr.onreadystatechange = onReadyStateChange;
</span><del>-xhr.open('GET', '/resources/network-simulator.php?path=/', true);
</del><ins>+xhr.open('GET', '/resources/network-simulator.php?test=xmlhttprequest-state-after-network-error&path=/', true);
</ins><span class="cx"> xhr.send(null);
</span><span class="cx">
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestxmlhttprequestresponseURLexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-responseURL-expected.txt (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-responseURL-expected.txt 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-responseURL-expected.txt 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -49,16 +49,6 @@
</span><span class="cx"> PASS responseURL is ""
</span><span class="cx"> req.readyState = 1: responseURL =
</span><span class="cx"> PASS responseURL is ""
</span><del>-req.readyState = 2: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/network-simulator.php?command=connect/
-req.readyState = 3: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/network-simulator.php?command=connect/
-req.readyState = 4: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/network-simulator.php?command=connect/
-PASS responseURL is "http://127.0.0.1:8000/xmlhttprequest/resources/network-simulator.php?command=connect/"
-req.readyState = 0: responseURL =
-PASS responseURL is ""
-req.readyState = 1: responseURL =
-PASS responseURL is ""
-req.readyState = 1: responseURL =
-PASS responseURL is ""
</del><span class="cx"> req.readyState = 2: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/supported-xml-content-types.cgi?type=foo
</span><span class="cx"> req.readyState = 3: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/supported-xml-content-types.cgi?type=foo
</span><span class="cx"> req.readyState = 4: responseURL = http://127.0.0.1:8000/xmlhttprequest/resources/supported-xml-content-types.cgi?type=foo
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestxmlhttprequestresponseURLhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-responseURL.html (175840 => 175841)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-responseURL.html 2014-11-11 01:15:38 UTC (rev 175840)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-responseURL.html 2014-11-11 01:16:15 UTC (rev 175841)
</span><span class="lines">@@ -53,11 +53,6 @@
</span><span class="cx"> window.responseURL = req.responseURL;
</span><span class="cx"> shouldBeEqualToString('responseURL', 'http://127.0.0.1:8000/xmlhttprequest/resources/cross-site-progress-events.cgi');
</span><span class="cx">
</span><del>- return runTest('resources/network-simulator.php?command=connect/', 'text');
-}).then(function(req) {
- window.responseURL = req.responseURL;
- shouldBeEqualToString('responseURL', 'http://127.0.0.1:8000/xmlhttprequest/resources/network-simulator.php?command=connect/');
-
</del><span class="cx"> return runTest("resources/supported-xml-content-types.cgi?type=foo#bar/baz+xml", 'xml');
</span><span class="cx"> }).then(function(req) {
</span><span class="cx"> window.responseURL = req.responseURL;
</span></span></pre>
</div>
</div>
</body>
</html>