diff options
| author | Ben Murdoch <benm@google.com> | 2010-05-11 18:35:50 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-05-14 10:23:05 +0100 |
| commit | 21939df44de1705786c545cd1bf519d47250322d (patch) | |
| tree | ef56c310f5c0cdc379c2abb2e212308a3281ce20 /LayoutTests/http | |
| parent | 4ff1d8891d520763f17675827154340c7c740f90 (diff) | |
| download | external_webkit-21939df44de1705786c545cd1bf519d47250322d.zip external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.gz external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.bz2 | |
Merge Webkit at r58956: Initial merge by Git.
Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
Diffstat (limited to 'LayoutTests/http')
10 files changed, 90 insertions, 4 deletions
diff --git a/LayoutTests/http/conf/apache2-debian-httpd.conf b/LayoutTests/http/conf/apache2-debian-httpd.conf index b8918db..7ef645f 100644 --- a/LayoutTests/http/conf/apache2-debian-httpd.conf +++ b/LayoutTests/http/conf/apache2-debian-httpd.conf @@ -681,7 +681,7 @@ ServerSignature On RewriteRule .* - [F] </IfModule> -<VirtualHost 127.0.0.1:8443> +<VirtualHost *:8443> ServerName 127.0.0.1 SSLEngine On </VirtualHost> diff --git a/LayoutTests/http/conf/apache2-httpd.conf b/LayoutTests/http/conf/apache2-httpd.conf index e915fa7..6b55a95 100644 --- a/LayoutTests/http/conf/apache2-httpd.conf +++ b/LayoutTests/http/conf/apache2-httpd.conf @@ -702,7 +702,7 @@ ServerSignature On RewriteRule .* - [F] </IfModule> -<VirtualHost 127.0.0.1:8443> +<VirtualHost *:8443> ServerName 127.0.0.1 SSLEngine On </VirtualHost> diff --git a/LayoutTests/http/conf/fedora-httpd.conf b/LayoutTests/http/conf/fedora-httpd.conf index 62100c8..b1560a9 100644 --- a/LayoutTests/http/conf/fedora-httpd.conf +++ b/LayoutTests/http/conf/fedora-httpd.conf @@ -882,7 +882,7 @@ AddHandler send-as-is asis RewriteRule .* - [F] </IfModule> -<VirtualHost 127.0.0.1:8443> +<VirtualHost *:8443> ServerName 127.0.0.1 SSLEngine On </VirtualHost> diff --git a/LayoutTests/http/conf/httpd.conf b/LayoutTests/http/conf/httpd.conf index 6e6157c..347deb4 100644 --- a/LayoutTests/http/conf/httpd.conf +++ b/LayoutTests/http/conf/httpd.conf @@ -737,7 +737,7 @@ ServerSignature On RewriteRule .* - [F] </IfModule> -<VirtualHost 127.0.0.1:8443> +<VirtualHost *:8443> ServerName 127.0.0.1 SSLEngine On </VirtualHost> diff --git a/LayoutTests/http/tests/appcache/credential-url-expected.txt b/LayoutTests/http/tests/appcache/credential-url-expected.txt new file mode 100644 index 0000000..3076236 --- /dev/null +++ b/LayoutTests/http/tests/appcache/credential-url-expected.txt @@ -0,0 +1,3 @@ +Test that application cache doesn't block loading resources from the same origin with credential. + +SUCCESS diff --git a/LayoutTests/http/tests/appcache/credential-url.html b/LayoutTests/http/tests/appcache/credential-url.html new file mode 100644 index 0000000..b6c7eec --- /dev/null +++ b/LayoutTests/http/tests/appcache/credential-url.html @@ -0,0 +1,28 @@ +<html manifest="http://user:password@127.0.0.1:8000/appcache/resources/empty.manifest"> +<body> +<p>Test that application cache doesn't block loading resources from the same origin with credential.</p> +<script> +if (window.layoutTestController) { + layoutTestController.dumpAsText(); + layoutTestController.waitUntilDone(); +} + +function test() +{ + var ifr = document.createElement("iframe"); + ifr.setAttribute("src", "javascript:parent.success(), 'PASS'"); + document.body.appendChild(ifr); +} + +function success() +{ + document.body.replaceChild(document.createTextNode("SUCCESS"), document.getElementsByTagName("iframe")[0]); + if (window.layoutTestController) + layoutTestController.notifyDone(); +} + +applicationCache.oncached = test; +applicationCache.onnoupdate = test; +</script> +<body> +</html> diff --git a/LayoutTests/http/tests/appcache/different-https-origin-resource-main-expected.txt b/LayoutTests/http/tests/appcache/different-https-origin-resource-main-expected.txt new file mode 100644 index 0000000..0dfbdc0 --- /dev/null +++ b/LayoutTests/http/tests/appcache/different-https-origin-resource-main-expected.txt @@ -0,0 +1,4 @@ +Test that a resource from a different https origin is not cached. + +PASS + diff --git a/LayoutTests/http/tests/appcache/different-https-origin-resource-main.html b/LayoutTests/http/tests/appcache/different-https-origin-resource-main.html new file mode 100644 index 0000000..55e744f --- /dev/null +++ b/LayoutTests/http/tests/appcache/different-https-origin-resource-main.html @@ -0,0 +1,19 @@ +<html> +<body> +<script> +if (window.layoutTestController) { + layoutTestController.waitUntilDone(); + layoutTestController.dumpAsText(); +} + +window.addEventListener("message", function(e) { + document.getElementById("result").innerHTML = e.data; + if (window.layoutTestController) + layoutTestController.notifyDone(); +}, false); +</script> +<p>Test that a resource from a different https origin is not cached.</p> +<div id=result></div> +<iframe src="https://127.0.0.1:8443/appcache/resources/different-https-origin-resource.html"></iframe> +</body> +</html> diff --git a/LayoutTests/http/tests/appcache/resources/different-https-origin-resource.html b/LayoutTests/http/tests/appcache/resources/different-https-origin-resource.html new file mode 100644 index 0000000..674706a --- /dev/null +++ b/LayoutTests/http/tests/appcache/resources/different-https-origin-resource.html @@ -0,0 +1,29 @@ +<html manifest="https://127.0.0.1:8443/appcache/resources/different-https-origin-resource.manifest"> +<script> +var hadError = false; +var result; + +function finish() +{ + if (!hadError) + result = "PASS"; + parent.postMessage(result, '*'); +} +function fail() +{ + result = "FAIL: Different https origin resource is getting downloaded to cache."; + hadError = true; +} +function error() +{ + result = "ERROR"; + hadError = true; + finish(); +} + +applicationCache.onprogress = function() { fail(); } +applicationCache.onnoupdate = function() { finish(); } +applicationCache.oncached = function() { finish(); } +applicationCache.onerror = function() { error(); } +</script> +</html> diff --git a/LayoutTests/http/tests/appcache/resources/different-https-origin-resource.manifest b/LayoutTests/http/tests/appcache/resources/different-https-origin-resource.manifest new file mode 100644 index 0000000..75a58a4 --- /dev/null +++ b/LayoutTests/http/tests/appcache/resources/different-https-origin-resource.manifest @@ -0,0 +1,3 @@ +CACHE MANIFEST +CACHE: +https://localhost:8443/appcache/resources/simple.txt |