From dcc8cf2e65d1aa555cce12431a16547e66b469ee Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 27 Apr 2010 16:31:00 +0100 Subject: Merge webkit.org at r58033 : Initial merge by git Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1 --- LayoutTests/http/conf/apache2-debian-httpd.conf | 10 ++++++++ LayoutTests/http/conf/apache2-httpd.conf | 6 +++++ LayoutTests/http/conf/cygwin-httpd.conf | 4 +++ LayoutTests/http/conf/fedora-httpd.conf | 6 +++++ LayoutTests/http/conf/httpd.conf | 4 +++ LayoutTests/http/conf/mime.types | 1 + .../http/tests/appcache/top-frame-2-expected.txt | 1 - LayoutTests/http/tests/appcache/top-frame-2.html | 25 +++++++++++++++++-- .../http/tests/appcache/top-frame-3-expected.txt | 2 -- LayoutTests/http/tests/appcache/top-frame-3.html | 29 +++++++++++++++++++--- .../http/tests/appcache/top-frame-4-expected.txt | 2 -- LayoutTests/http/tests/appcache/top-frame-4.html | 29 +++++++++++++++++++--- 12 files changed, 104 insertions(+), 15 deletions(-) (limited to 'LayoutTests/http') diff --git a/LayoutTests/http/conf/apache2-debian-httpd.conf b/LayoutTests/http/conf/apache2-debian-httpd.conf index 03aa9c8..b8918db 100644 --- a/LayoutTests/http/conf/apache2-debian-httpd.conf +++ b/LayoutTests/http/conf/apache2-debian-httpd.conf @@ -163,6 +163,16 @@ MaxRequestsPerChild 100000 #Listen 3000 Listen 127.0.0.1:8080 Listen 127.0.0.1:8443 +# We listen to both IPv4 and IPv6 loop-back addresses, but ignore +# requests to 8000 from random users on network. +# See https://bugs.webkit.org/show_bug.cgi?id=37104 +# FIXME: This breaks the GTK-Debug and Chromium-Linux bots. +# Starting up apache fails on this line with a syntax error. +# Need a way to detect if the machine supports ipv6 and then +# only do this binding in that case. +#Listen [::1]:8000 +#Listen [::1]:8080 +#Listen [::1]:8443 # # Dynamic Shared Object (DSO) Support diff --git a/LayoutTests/http/conf/apache2-httpd.conf b/LayoutTests/http/conf/apache2-httpd.conf index 980e4e2..e915fa7 100644 --- a/LayoutTests/http/conf/apache2-httpd.conf +++ b/LayoutTests/http/conf/apache2-httpd.conf @@ -163,6 +163,12 @@ MaxRequestsPerChild 100000 #Listen 3000 Listen 127.0.0.1:8080 Listen 127.0.0.1:8443 +# We listen to both IPv4 and IPv6 loop-back addresses, but ignore +# requests to 8000 from random users on network. +# See https://bugs.webkit.org/show_bug.cgi?id=37104 +Listen [::1]:8000 +Listen [::1]:8080 +Listen [::1]:8443 # # Dynamic Shared Object (DSO) Support diff --git a/LayoutTests/http/conf/cygwin-httpd.conf b/LayoutTests/http/conf/cygwin-httpd.conf index a79ed39..1651912 100644 --- a/LayoutTests/http/conf/cygwin-httpd.conf +++ b/LayoutTests/http/conf/cygwin-httpd.conf @@ -179,6 +179,10 @@ MaxRequestsPerChild 100000 # #Listen 3000 Listen 127.0.0.1:8080 +# Apache 1.3 only supports IPv4, so we do not listen on ::1 (IPv6 loopback). +# This may cause flaky tests on systems which support IPv6 if localhost resolves +# to ::1 in addition to 127.0.0.1. +# See https://bugs.webkit.org/show_bug.cgi?id=37104 # # Dynamic Shared Object (DSO) Support diff --git a/LayoutTests/http/conf/fedora-httpd.conf b/LayoutTests/http/conf/fedora-httpd.conf index cd71d88..62100c8 100644 --- a/LayoutTests/http/conf/fedora-httpd.conf +++ b/LayoutTests/http/conf/fedora-httpd.conf @@ -138,6 +138,12 @@ MaxRequestsPerChild 100000 #Listen 12.34.56.78:80 Listen 127.0.0.1:8080 Listen 127.0.0.1:8443 +# We listen to both IPv4 and IPv6 loop-back addresses, but ignore +# requests to 8000 from random users on network. +# See https://bugs.webkit.org/show_bug.cgi?id=37104 +Listen [::1]:8000 +Listen [::1]:8080 +Listen [::1]:8443 # # Dynamic Shared Object (DSO) Support diff --git a/LayoutTests/http/conf/httpd.conf b/LayoutTests/http/conf/httpd.conf index ec04c73..6e6157c 100644 --- a/LayoutTests/http/conf/httpd.conf +++ b/LayoutTests/http/conf/httpd.conf @@ -181,6 +181,10 @@ MaxRequestsPerChild 100000 #Listen 3000 Listen 127.0.0.1:8080 Listen 127.0.0.1:8443 +# Apache 1.3 only supports IPv4, so we do not listen on ::1 (IPv6 loopback). +# This may cause flaky tests on systems which support IPv6 if localhost resolves +# to ::1 in addition to 127.0.0.1. +# See https://bugs.webkit.org/show_bug.cgi?id=37104 # # Dynamic Shared Object (DSO) Support diff --git a/LayoutTests/http/conf/mime.types b/LayoutTests/http/conf/mime.types index cfb9d53..0489350 100644 --- a/LayoutTests/http/conf/mime.types +++ b/LayoutTests/http/conf/mime.types @@ -324,6 +324,7 @@ application/vnd.vividence.scriptfile application/vnd.vsf application/vnd.wap.sic application/vnd.wap.slc +application/vnd.wap.xhtml+xml xhtmlmp application/vnd.wap.wbxml wbxml application/vnd.wap.wmlc wmlc application/vnd.wap.wmlscriptc wmlsc diff --git a/LayoutTests/http/tests/appcache/top-frame-2-expected.txt b/LayoutTests/http/tests/appcache/top-frame-2-expected.txt index 6e99bb6..41a3fe0 100644 --- a/LayoutTests/http/tests/appcache/top-frame-2-expected.txt +++ b/LayoutTests/http/tests/appcache/top-frame-2-expected.txt @@ -2,6 +2,5 @@ Test that a subframe without manifest gets picked by a relevant application cach Should say SUCCESS: -checking SUCCESS diff --git a/LayoutTests/http/tests/appcache/top-frame-2.html b/LayoutTests/http/tests/appcache/top-frame-2.html index c239d08..71bd468 100644 --- a/LayoutTests/http/tests/appcache/top-frame-2.html +++ b/LayoutTests/http/tests/appcache/top-frame-2.html @@ -16,13 +16,34 @@ function log(message) document.getElementById("result").innerHTML += message + "
"; } +function debug(message) +{ + // If running manually in the browser, print the sequence of events. + if (!window.layoutTestController) + log(message); +} + +var receivedExpectedMessage = false; +var receivedCheckingEvent = false; +var receivedNoupdateEvent = false; + +function checkDone() +{ + if (receivedExpectedMessage && receivedCheckingEvent && receivedNoupdateEvent) { + log("SUCCESS"); + if (window.layoutTestController) + layoutTestController.notifyDone(); + } +} + function test() { applicationCache.onnoupdate = null; applicationCache.oncached = null; // When a new main resource is associated with the cache, an update should be started. - applicationCache.onchecking = function() { log("checking") } + applicationCache.onchecking = function() { debug("checking"); receivedCheckingEvent = true; checkDone(); } + applicationCache.onnoupdate = function() { debug("noupdate"); receivedNoupdateEvent = true; checkDone(); } var ifr = document.createElement("iframe"); ifr.setAttribute("src", "resources/subframe-2.html"); @@ -35,7 +56,7 @@ applicationCache.oncached = function() { test() } applicationCache.onupdateready = function() { log("FAIL: received unexpected updateready event") } applicationCache.onerror = function() { log("FAIL: received unexpected error event") } -window.addEventListener("message", function() { log("SUCCESS"); if (window.layoutTestController) layoutTestController.notifyDone() }, false); +window.addEventListener("message", function() { debug("message"); receivedExpectedMessage = true; checkDone(); }, false); diff --git a/LayoutTests/http/tests/appcache/top-frame-3-expected.txt b/LayoutTests/http/tests/appcache/top-frame-3-expected.txt index a10dbee..a1245cb 100644 --- a/LayoutTests/http/tests/appcache/top-frame-3-expected.txt +++ b/LayoutTests/http/tests/appcache/top-frame-3-expected.txt @@ -4,7 +4,5 @@ In this case, the subframe resource is NOT listed in manifest explicitly. Should say SUCCESS: -checking -checking SUCCESS diff --git a/LayoutTests/http/tests/appcache/top-frame-3.html b/LayoutTests/http/tests/appcache/top-frame-3.html index 9fc9dde..a2d2cc6 100644 --- a/LayoutTests/http/tests/appcache/top-frame-3.html +++ b/LayoutTests/http/tests/appcache/top-frame-3.html @@ -16,13 +16,34 @@ function log(message) document.getElementById("result").innerHTML += message + "
"; } +function debug(message) +{ + // If running manually in the browser, print the sequence of events. + if (!window.layoutTestController) + log(message); +} + +var receivedExpectedMessage = false; +var receivedCheckingEventsCounter = 0; +var receivedNoupdateEventsCounter = 0; + +function checkDone() +{ + if (receivedExpectedMessage && receivedCheckingEventsCounter == 2 && receivedNoupdateEventsCounter == 2) { + log("SUCCESS"); + if (window.layoutTestController) + layoutTestController.notifyDone(); + } +} + function test() { applicationCache.onnoupdate = null; applicationCache.oncached = null; // When a new main resource is associated with the cache, an update should be started. - applicationCache.onchecking = function() { log("checking") } + applicationCache.onchecking = function() { debug("checking"); receivedCheckingEventsCounter++; checkDone() } + applicationCache.onnoupdate = function() { debug("noupdate"); receivedNoupdateEventsCounter++; checkDone(); } var ifr = document.createElement("iframe"); ifr.setAttribute("src", "resources/subframe-3.html"); @@ -42,9 +63,9 @@ function test2() function test3() { - log("SUCCESS"); - if (window.layoutTestController) - layoutTestController.notifyDone(); + debug("message"); + receivedExpectedMessage = true; + checkDone(); } applicationCache.onnoupdate = function() { test() } diff --git a/LayoutTests/http/tests/appcache/top-frame-4-expected.txt b/LayoutTests/http/tests/appcache/top-frame-4-expected.txt index 43bfd43..e748160 100644 --- a/LayoutTests/http/tests/appcache/top-frame-4-expected.txt +++ b/LayoutTests/http/tests/appcache/top-frame-4-expected.txt @@ -4,7 +4,5 @@ In this case, the subframe resource is listed in manifest explicitly. Should say SUCCESS: -checking -checking SUCCESS diff --git a/LayoutTests/http/tests/appcache/top-frame-4.html b/LayoutTests/http/tests/appcache/top-frame-4.html index 39743b9..c36e0a3 100644 --- a/LayoutTests/http/tests/appcache/top-frame-4.html +++ b/LayoutTests/http/tests/appcache/top-frame-4.html @@ -16,13 +16,34 @@ function log(message) document.getElementById("result").innerHTML += message + "
"; } +function debug(message) +{ + // If running manually in the browser, print the sequence of events. + if (!window.layoutTestController) + log(message); +} + +var receivedExpectedMessage = false; +var receivedCheckingEventsCounter = 0; +var receivedNoupdateEventsCounter = 0; + +function checkDone() +{ + if (receivedExpectedMessage && receivedCheckingEventsCounter == 2 && receivedNoupdateEventsCounter == 2) { + log("SUCCESS"); + if (window.layoutTestController) + layoutTestController.notifyDone(); + } +} + function test() { applicationCache.onnoupdate = null; applicationCache.oncached = null; // When a new main resource is associated with the cache, an update should be started. - applicationCache.onchecking = function() { log("checking") } + applicationCache.onchecking = function() { debug("checking"); receivedCheckingEventsCounter++; checkDone() } + applicationCache.onnoupdate = function() { debug("noupdate"); receivedNoupdateEventsCounter++; checkDone(); } var ifr = document.createElement("iframe"); ifr.setAttribute("src", "resources/subframe-4.html"); @@ -42,9 +63,9 @@ function test2() function test3() { - log("SUCCESS"); - if (window.layoutTestController) - layoutTestController.notifyDone(); + debug("message"); + receivedExpectedMessage = true; + checkDone(); } applicationCache.onnoupdate = function() { test() } -- cgit v1.1