Multiple HTTP tests fail with Apache 2.4.25
authorap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 3 Feb 2017 01:46:25 +0000 (01:46 +0000)
committerap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 3 Feb 2017 01:46:25 +0000 (01:46 +0000)
https://bugs.webkit.org/show_bug.cgi?id=167678
<rdar://problem/30060142>

Reviewed by Sam Weinig.

Newer versions of Apache have a security fix where they generate an internal server
error upon seeing an invalid HTTP header field. There is an opt-out configuration
option which didn't quite work in my testing, but regardless, we should only use
"nph-" CGIs for invalid responses. This is how Apache knows that it shouldn't
attempt to parse the response.

This also uncovered a test bug.

* http/tests/cache/disk-cache/resources/cache-test.js: (generateTestURL):
Without escaping, we were getting a broken response in attachment tests:
   Content-Disposition: attachment
    filename: "f.txt"
Note how ";" turned into a newline.

* http/tests/misc/non-utf8-header-name-expected.txt: Removed.
* http/tests/misc/non-utf8-header-name.php: Removed.
* http/tests/misc/nph-non-utf8-header-name-expected.txt: Copied from LayoutTests/http/tests/misc/non-utf8-header-name-expected.txt.
* http/tests/misc/nph-non-utf8-header-name.pl: Copied from LayoutTests/http/tests/misc/non-utf8-header-name.php.
* http/tests/preload/download_resources_from_invalid_headers.html:
* http/tests/preload/resources/invalid_resources_from_header.php: Removed.
* http/tests/preload/resources/nph-invalid_resources_from_header.pl: Copied from LayoutTests/http/tests/preload/resources/invalid_resources_from_header.php.
* http/tests/security/contentSecurityPolicy/directive-parsing-01.html:
* http/tests/security/contentSecurityPolicy/directive-parsing-02.html:
* http/tests/security/contentSecurityPolicy/directive-parsing-03.html:
* http/tests/security/contentSecurityPolicy/directive-parsing-04.html:
* http/tests/security/contentSecurityPolicy/directive-parsing-05.html:
* http/tests/security/contentSecurityPolicy/resources/echo-script-src.pl: Removed.
* http/tests/security/contentSecurityPolicy/resources/multiple-iframe-test.js:
* http/tests/security/contentSecurityPolicy/resources/nph-echo-script-src.pl: Copied from LayoutTests/http/tests/security/contentSecurityPolicy/resources/echo-script-src.pl.
* http/tests/security/contentSecurityPolicy/script-loads-with-img-src.html:
* http/tests/security/contentSecurityPolicy/script-src-none.html:
* http/tests/security/contentSecurityPolicy/script-src-self-blocked-01.html:
* http/tests/security/contentSecurityPolicy/script-src-self-blocked-02.html:
* http/tests/security/contentSecurityPolicy/script-src-self-blocked-03.html:
* http/tests/security/contentSecurityPolicy/script-src-self.html:
* http/tests/security/contentSecurityPolicy/script-src-star-cross-scheme.html:
Changed scripts that are used to generate invalid responses to "nph-" ones.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@211616 268f45cc-cd09-0410-ab3c-d52691b4dbfc

22 files changed:
LayoutTests/ChangeLog
LayoutTests/http/tests/cache/disk-cache/resources/cache-test.js
LayoutTests/http/tests/misc/non-utf8-header-name.php [deleted file]
LayoutTests/http/tests/misc/nph-non-utf8-header-name-expected.txt [moved from LayoutTests/http/tests/misc/non-utf8-header-name-expected.txt with 100% similarity]
LayoutTests/http/tests/misc/nph-non-utf8-header-name.pl [new file with mode: 0755]
LayoutTests/http/tests/preload/download_resources_from_invalid_headers.html
LayoutTests/http/tests/preload/resources/invalid_resources_from_header.php [deleted file]
LayoutTests/http/tests/preload/resources/nph-invalid_resources_from_header.pl [new file with mode: 0755]
LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-01.html
LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-02.html
LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-03.html
LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-04.html
LayoutTests/http/tests/security/contentSecurityPolicy/directive-parsing-05.html
LayoutTests/http/tests/security/contentSecurityPolicy/resources/multiple-iframe-test.js
LayoutTests/http/tests/security/contentSecurityPolicy/resources/nph-echo-script-src.pl [moved from LayoutTests/http/tests/security/contentSecurityPolicy/resources/echo-script-src.pl with 96% similarity]
LayoutTests/http/tests/security/contentSecurityPolicy/script-loads-with-img-src.html
LayoutTests/http/tests/security/contentSecurityPolicy/script-src-none.html
LayoutTests/http/tests/security/contentSecurityPolicy/script-src-self-blocked-01.html
LayoutTests/http/tests/security/contentSecurityPolicy/script-src-self-blocked-02.html
LayoutTests/http/tests/security/contentSecurityPolicy/script-src-self-blocked-03.html
LayoutTests/http/tests/security/contentSecurityPolicy/script-src-self.html
LayoutTests/http/tests/security/contentSecurityPolicy/script-src-star-cross-scheme.html

index a9903be..a4b0558 100644 (file)
@@ -1,3 +1,49 @@
+2017-02-02  Alexey Proskuryakov  <ap@apple.com>
+
+        Multiple HTTP tests fail with Apache 2.4.25
+        https://bugs.webkit.org/show_bug.cgi?id=167678
+        <rdar://problem/30060142>
+
+        Reviewed by Sam Weinig.
+
+        Newer versions of Apache have a security fix where they generate an internal server
+        error upon seeing an invalid HTTP header field. There is an opt-out configuration
+        option which didn't quite work in my testing, but regardless, we should only use
+        "nph-" CGIs for invalid responses. This is how Apache knows that it shouldn't
+        attempt to parse the response.
+
+        This also uncovered a test bug.
+
+        * http/tests/cache/disk-cache/resources/cache-test.js: (generateTestURL):
+        Without escaping, we were getting a broken response in attachment tests:
+           Content-Disposition: attachment
+            filename: "f.txt"
+        Note how ";" turned into a newline.
+
+        * http/tests/misc/non-utf8-header-name-expected.txt: Removed.
+        * http/tests/misc/non-utf8-header-name.php: Removed.
+        * http/tests/misc/nph-non-utf8-header-name-expected.txt: Copied from LayoutTests/http/tests/misc/non-utf8-header-name-expected.txt.
+        * http/tests/misc/nph-non-utf8-header-name.pl: Copied from LayoutTests/http/tests/misc/non-utf8-header-name.php.
+        * http/tests/preload/download_resources_from_invalid_headers.html:
+        * http/tests/preload/resources/invalid_resources_from_header.php: Removed.
+        * http/tests/preload/resources/nph-invalid_resources_from_header.pl: Copied from LayoutTests/http/tests/preload/resources/invalid_resources_from_header.php.
+        * http/tests/security/contentSecurityPolicy/directive-parsing-01.html:
+        * http/tests/security/contentSecurityPolicy/directive-parsing-02.html:
+        * http/tests/security/contentSecurityPolicy/directive-parsing-03.html:
+        * http/tests/security/contentSecurityPolicy/directive-parsing-04.html:
+        * http/tests/security/contentSecurityPolicy/directive-parsing-05.html:
+        * http/tests/security/contentSecurityPolicy/resources/echo-script-src.pl: Removed.
+        * http/tests/security/contentSecurityPolicy/resources/multiple-iframe-test.js:
+        * http/tests/security/contentSecurityPolicy/resources/nph-echo-script-src.pl: Copied from LayoutTests/http/tests/security/contentSecurityPolicy/resources/echo-script-src.pl.
+        * http/tests/security/contentSecurityPolicy/script-loads-with-img-src.html:
+        * http/tests/security/contentSecurityPolicy/script-src-none.html:
+        * http/tests/security/contentSecurityPolicy/script-src-self-blocked-01.html:
+        * http/tests/security/contentSecurityPolicy/script-src-self-blocked-02.html:
+        * http/tests/security/contentSecurityPolicy/script-src-self-blocked-03.html:
+        * http/tests/security/contentSecurityPolicy/script-src-self.html:
+        * http/tests/security/contentSecurityPolicy/script-src-star-cross-scheme.html:
+        Changed scripts that are used to generate invalid responses to "nph-" ones.
+
 2017-02-02  Chris Dumez  <cdumez@apple.com>
 
         Suspend SVG animations in hidden pages
index 8d87fff..4662dfe 100644 (file)
@@ -42,7 +42,7 @@ function makeHeaderValue(value)
 
 function generateTestURL(test)
 {
-    var body = typeof test.body !== 'undefined' ? test.body : "";
+    var body = typeof test.body !== 'undefined' ? escape(test.body) : "";
     var expiresInFutureIn304 = typeof test.expiresInFutureIn304 !== 'undefined' ? test.expiresInFutureIn304 : false;
     var uniqueTestId = Math.floor((Math.random() * 1000000000000));
     var testURL = "resources/generate-response.cgi?body=" + body;
@@ -54,7 +54,7 @@ function generateTestURL(test)
     if (!test.responseHeaders || !test.responseHeaders["Content-Type"])
         testURL += "&Content-Type=text/plain";
     for (var header in test.responseHeaders)
-        testURL += '&' + header + '=' + makeHeaderValue(test.responseHeaders[header]);
+        testURL += '&' + header + '=' + escape(makeHeaderValue(test.responseHeaders[header]));
     return testURL;
 }
 
diff --git a/LayoutTests/http/tests/misc/non-utf8-header-name.php b/LayoutTests/http/tests/misc/non-utf8-header-name.php
deleted file mode 100644 (file)
index f662ebf..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-header('HTTP/1.1 200 OK');
-header('Ã: text/html');
-echo '<script>';
-echo '   if (window.testRunner)';
-echo '       testRunner.dumpAsText();';
-echo '</script>';
-echo '<p>Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=96284">bug 96284</a>: Non UTF-8 HTTP headers do not cause a crash.</p>';
-?>
diff --git a/LayoutTests/http/tests/misc/nph-non-utf8-header-name.pl b/LayoutTests/http/tests/misc/nph-non-utf8-header-name.pl
new file mode 100755 (executable)
index 0000000..a5758b9
--- /dev/null
@@ -0,0 +1,14 @@
+#!/usr/bin/perl -wT
+use strict;
+
+print <<"EOL";
+HTTP/1.1 200 OK
+Ã: text/html
+Content-Type: text/html
+
+<script>
+   if (window.testRunner)
+       testRunner.dumpAsText();
+</script>
+<p>Test for <a href="https://bugs.webkit.org/show_bug.cgi?id=96284">bug 96284</a>: Non UTF-8 HTTP headers do not cause a crash.</p>
+EOL
index 6343c51..8ec96fa 100644 (file)
@@ -5,5 +5,5 @@
         testRunner.dumpChildFramesAsText();
     }
 </script>
-<iframe src="resources/invalid_resources_from_header.php">
+<iframe src="resources/nph-invalid_resources_from_header.pl">
 
diff --git a/LayoutTests/http/tests/preload/resources/invalid_resources_from_header.php b/LayoutTests/http/tests/preload/resources/invalid_resources_from_header.php
deleted file mode 100644 (file)
index 4698f97..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-header("Link: <   ../resources/dummy.js >; rel=preload; as=script", false);
-header("Link: <../משאבים/dummy.css>; rel=preload; as=style", false);
-header("Link: <../résôûrcès/dummy.css>; rel=preload; as=style", false);
-header("Link: <../resources/Ahem{.ttf,.woff}>; rel=preload; as=font; crossorigin", false);
-header("Link: <../resources/test\f.mp4>; rel=preload; as=media", false);
-header("Link: <../security/resources/cap\ttions.vtt>; rel=preload; as=track", false);
-header("Link: <../resources/dummy   .xml>; rel=preload;", false);
-header("Link: <../resources/dumm>y.xml>; rel=preload", false);
-header("Content-Security-Policy: img-src 'none'", false);
-header("Link: <http://localhost:8000/preload/resources/square.png>; rel=preload; as=image", false);
-header("Link: <http://localhost:53/preload/resources/dummy.js>; rel=preload; as=script", false);
-header("Link: <#foobar>; rel=preload; as=style", false);
-header("Link: <>; rel=preload; as=style", false);
-header("Link: <   \t>; rel=preload; as=style", false);
-header("Link: >; rel=preload; as=style", false);
-header("Link: <; rel=preload; as=style", false);
-header("Link: ; rel=preload; as=style", false);
-header("Link <../resources/Ahem.ttf>; rel=preload; as=font; crossorigin", false);
-header("Link: <   ../resources/dummy.js?foobar >; rel=preload; as='", false);
-header("Link: <<../resources/dummy.js?invalid>>; rel=preload; as=script", false);
-header("Link: <../resources/dummy.js?invalid>>; rel=preload; as=script", false);
-header("Link: <<../resources/dummy.js?invalid>; rel=preload; as=script", false);
-?>
-<!DOCTYPE html>
-<script src="/js-test-resources/js-test.js"></script>
-<script>
-    shouldBeTrue("internals.isPreloaded('../resources/dummy.js');");
-    shouldBeFalse("internals.isPreloaded('../משאבים/dummy.css');");
-    shouldBeFalse("internals.isPreloaded('../résôûrcès/square.png');");
-    // Invalid URLs get preloaded (and get terminated further down the stack)
-    shouldBeTrue("internals.isPreloaded('../resources/Ahem{.ttf,.woff}');");
-    shouldBeFalse("internals.isPreloaded('../resources/test.mp4');");
-    shouldBeTrue("internals.isPreloaded('../resources/test\f.mp4');");
-    shouldBeTrue("internals.isPreloaded('../security/resources/cap\ttions.vtt');");
-    shouldBeFalse("internals.isPreloaded('../resources/dummy.xml?badvalue');");
-    shouldBeTrue("internals.isPreloaded('../resources/dummy   .xml');");
-    shouldBeFalse("internals.isPreloaded('../resources/dummy.xml');");
-    shouldBeFalse("internals.isPreloaded('../resources/dumm');");
-    shouldBeFalse("internals.isPreloaded('http://localhost:8000/preload/resources/square.png');");
-    // Invalid ports get preloaded (and get terminated further down the stack).
-    shouldBeTrue("internals.isPreloaded('http://localhost:53/preload/resources/dummy.js');");
-    shouldBeFalse("internals.isPreloaded('#foobar');");
-    shouldBeFalse("internals.isPreloaded('../resources/Ahem.ttf');");
-    shouldBeFalse("internals.isPreloaded('../resources/dummy.js?invalid');");
-</script>
diff --git a/LayoutTests/http/tests/preload/resources/nph-invalid_resources_from_header.pl b/LayoutTests/http/tests/preload/resources/nph-invalid_resources_from_header.pl
new file mode 100755 (executable)
index 0000000..af49b33
--- /dev/null
@@ -0,0 +1,52 @@
+#!/usr/bin/perl -wT
+use strict;
+
+print <<"EOL";
+HTTP/1.1 200 OK
+Link: <   ../resources/dummy.js >; rel=preload; as=script
+Link: <../משאבים/dummy.css>; rel=preload; as=style
+Link: <../résôûrcès/dummy.css>; rel=preload; as=style
+Link: <../resources/Ahem{.ttf,.woff}>; rel=preload; as=font; crossorigin
+Link: <../resources/test\f.mp4>; rel=preload; as=media
+Link: <../security/resources/cap\ttions.vtt>; rel=preload; as=track
+Link: <../resources/dummy   .xml>; rel=preload;
+Link: <../resources/dumm>y.xml>; rel=preload
+Content-Security-Policy: img-src 'none'
+Link: <http://localhost:8000/preload/resources/square.png>; rel=preload; as=image
+Link: <http://localhost:53/preload/resources/dummy.js>; rel=preload; as=script
+Link: <#foobar>; rel=preload; as=style
+Link: <>; rel=preload; as=style
+Link: <   \t>; rel=preload; as=style
+Link: >; rel=preload; as=style
+Link: <; rel=preload; as=style
+Link: ; rel=preload; as=style
+Link <../resources/Ahem.ttf>; rel=preload; as=font; crossorigin
+Link: <   ../resources/dummy.js?foobar >; rel=preload; as='
+Link: <<../resources/dummy.js?invalid>>; rel=preload; as=script
+Link: <../resources/dummy.js?invalid>>; rel=preload; as=script
+Link: <<../resources/dummy.js?invalid>; rel=preload; as=script
+Content-Type: text/html
+
+<!DOCTYPE html>
+<script src="/js-test-resources/js-test.js"></script>
+<script>
+    shouldBeTrue("internals.isPreloaded('../resources/dummy.js');");
+    shouldBeFalse("internals.isPreloaded('../משאבים/dummy.css');");
+    shouldBeFalse("internals.isPreloaded('../résôûrcès/square.png');");
+    // Invalid URLs get preloaded (and get terminated further down the stack)
+    shouldBeTrue("internals.isPreloaded('../resources/Ahem{.ttf,.woff}');");
+    shouldBeFalse("internals.isPreloaded('../resources/test.mp4');");
+    shouldBeTrue("internals.isPreloaded('../resources/test\f.mp4');");
+    shouldBeTrue("internals.isPreloaded('../security/resources/cap\ttions.vtt');");
+    shouldBeFalse("internals.isPreloaded('../resources/dummy.xml?badvalue');");
+    shouldBeTrue("internals.isPreloaded('../resources/dummy   .xml');");
+    shouldBeFalse("internals.isPreloaded('../resources/dummy.xml');");
+    shouldBeFalse("internals.isPreloaded('../resources/dumm');");
+    shouldBeFalse("internals.isPreloaded('http://localhost:8000/preload/resources/square.png');");
+    // Invalid ports get preloaded (and get terminated further down the stack).
+    shouldBeTrue("internals.isPreloaded('http://localhost:53/preload/resources/dummy.js');");
+    shouldBeFalse("internals.isPreloaded('#foobar');");
+    shouldBeFalse("internals.isPreloaded('../resources/Ahem.ttf');");
+    shouldBeFalse("internals.isPreloaded('../resources/dummy.js?invalid');");
+</script>
+EOL
\ No newline at end of file
index d4e036e..ce4698b 100644 (file)
@@ -12,6 +12,6 @@ if (window.testRunner) {
   <p>
     This script should not execute even though there are parse errors in the policy.
   </p>
-  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/echo-script-src.pl?should_run=no&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=allow%20*%3B%20script-src%20'none'%3B%20%20%3B%20"></iframe>
+  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/nph-echo-script-src.pl?should_run=no&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=allow%20*%3B%20script-src%20'none'%3B%20%20%3B%20"></iframe>
 </body>
 </html>
index e1be72b..1a40c24 100644 (file)
@@ -12,6 +12,6 @@ if (window.testRunner) {
   <p>
     This script should not execute even though there are parse errors in the policy.
   </p>
-  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/echo-script-src.pl?should_run=no&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=script-src%20'none'%3B%20aaa%20%3B%20"></iframe>
+  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/nph-echo-script-src.pl?should_run=no&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=script-src%20'none'%3B%20aaa%20%3B%20"></iframe>
 </body>
 </html>
index a568863..6b6b1b2 100644 (file)
@@ -12,6 +12,6 @@ if (window.testRunner) {
   <p>
     This script should not execute even though there are parse errors in the policy.
   </p>
-  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/echo-script-src.pl?should_run=no&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=script-src%20'none'%3B%20a%07aa%20%3B%20"></iframe>
+  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/nph-echo-script-src.pl?should_run=no&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=script-src%20'none'%3B%20a%07aa%20%3B%20"></iframe>
 </body>
 </html>
index b253361..4d30f89 100644 (file)
@@ -13,6 +13,6 @@ if (window.testRunner) {
     A warning should be logged to the console, as `script-src: 'none'` shouldn't
     contain a colon. Since the directive is invalid, the script should run.
   </p>
-  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/echo-script-src.pl?should_run=yes&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=script-src%3A%20'none'"></iframe>
+  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/nph-echo-script-src.pl?should_run=yes&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=script-src%3A%20'none'"></iframe>
 </body>
 </html>
index 5339887..837401e 100644 (file)
@@ -12,7 +12,7 @@ if (window.testRunner) {
   <p>
     Directives starting with an invalid character should be logged and ignored.
   </p>
-  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/echo-script-src.pl?should_run=yes&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=:script-src%20'none'"></iframe>
+  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/nph-echo-script-src.pl?should_run=yes&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=:script-src%20'none'"></iframe>
 </body>
 </html>
 
index cfc7292..67f8830 100644 (file)
@@ -32,7 +32,7 @@ function testImpl(experimental, preescapedPolicy) {
     if (current[2].match(/^data:/) || current[2].match(/^https?:/))
         scriptToLoad = encodeURIComponent(current[2]);
 
-    iframe.src = baseURL + "resources/echo-script-src.pl?" +
+    iframe.src = baseURL + "resources/nph-echo-script-src.pl?" +
                  "experimental=" + (experimental ? "true" : "false") +
                  "&should_run=" + encodeURIComponent(current[0]) +
                  "&csp=" + policy + "&q=" + scriptToLoad;
index 368c4af..4a3f9b2 100644 (file)
@@ -9,6 +9,6 @@ if (window.testRunner) {
 </script>
 </head>
 <body>
-  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/echo-script-src.pl?should_run=yes&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=script-img%20'none'"></iframe>
+  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/nph-echo-script-src.pl?should_run=yes&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=script-img%20'none'"></iframe>
 </body>
 </html>
index 1ead91f..1a0133b 100644 (file)
@@ -12,6 +12,6 @@ if (window.testRunner) {
   <p>
     Loads an iframe which in turns tries to load an external script. The iframe has a content security policy disabling external scripts. So the script should not get executed.
   </p>
-  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/echo-script-src.pl?should_run=no&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=allow%20*%3B%20script-src%20'none'"></iframe>
+  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/nph-echo-script-src.pl?should_run=no&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=allow%20*%3B%20script-src%20'none'"></iframe>
 </body>
 </html>
index 758bf52..5752d4e 100644 (file)
@@ -9,6 +9,6 @@ if (window.testRunner) {
 </script>
 </head>
 <body>
-  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/echo-script-src.pl?should_run=no&q=http://localhost:8000/security/contentSecurityPolicy/resources/script.js&csp=script-src%20'self'"></iframe>
+  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/nph-echo-script-src.pl?should_run=no&q=http://localhost:8000/security/contentSecurityPolicy/resources/script.js&csp=script-src%20'self'"></iframe>
 </body>
 </html>
index 26cbb8d..6c79ea3 100644 (file)
@@ -9,6 +9,6 @@ if (window.testRunner) {
 </script>
 </head>
 <body>
-  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/echo-script-src.pl?should_run=no&q=http://127.0.0.1:8080/security/contentSecurityPolicy/resources/script.js&csp=script-src%20'self'"></iframe>
+  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/nph-echo-script-src.pl?should_run=no&q=http://127.0.0.1:8080/security/contentSecurityPolicy/resources/script.js&csp=script-src%20'self'"></iframe>
 </body>
 </html>
index 4a58376..6a13441 100644 (file)
@@ -9,6 +9,6 @@ if (window.testRunner) {
 </script>
 </head>
 <body>
-  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/echo-script-src.pl?should_run=no&q=https://127.0.0.1:8443/security/contentSecurityPolicy/resources/script.js&csp=script-src%20'self'"></iframe>
+  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/nph-echo-script-src.pl?should_run=no&q=https://127.0.0.1:8443/security/contentSecurityPolicy/resources/script.js&csp=script-src%20'self'"></iframe>
 </body>
 </html>
index 31dc3e2..e0ed694 100644 (file)
@@ -9,6 +9,6 @@ if (window.testRunner) {
 </script>
 </head>
 <body>
-  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/echo-script-src.pl?should_run=yes&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=script-src%20'self'"></iframe>
+  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/nph-echo-script-src.pl?should_run=yes&q=http://127.0.0.1:8000/security/contentSecurityPolicy/resources/script.js&csp=script-src%20'self'"></iframe>
 </body>
 </html>
index 34dad04..30696cd 100644 (file)
@@ -9,6 +9,6 @@ if (window.testRunner) {
 </script>
 </head>
 <body>
-  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/echo-script-src.pl?should_run=yes&q=https://127.0.0.1:8443/security/contentSecurityPolicy/resources/script.js&csp=script-src%20*"></iframe>
+  <iframe src="http://127.0.0.1:8000/security/contentSecurityPolicy/resources/nph-echo-script-src.pl?should_run=yes&q=https://127.0.0.1:8443/security/contentSecurityPolicy/resources/script.js&csp=script-src%20*"></iframe>
 </body>
 </html>