diff options
| author | Steve Block <steveblock@google.com> | 2010-04-27 16:31:00 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:12 +0100 |
| commit | dcc8cf2e65d1aa555cce12431a16547e66b469ee (patch) | |
| tree | 92a8d65cd5383bca9749f5327fb5e440563926e6 /LayoutTests/http/conf | |
| parent | ccac38a6b48843126402088a309597e682f40fe6 (diff) | |
| download | external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.zip external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.gz external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.bz2 | |
Merge webkit.org at r58033 : Initial merge by git
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
Diffstat (limited to 'LayoutTests/http/conf')
| -rw-r--r-- | LayoutTests/http/conf/apache2-debian-httpd.conf | 10 | ||||
| -rw-r--r-- | LayoutTests/http/conf/apache2-httpd.conf | 6 | ||||
| -rw-r--r-- | LayoutTests/http/conf/cygwin-httpd.conf | 4 | ||||
| -rw-r--r-- | LayoutTests/http/conf/fedora-httpd.conf | 6 | ||||
| -rw-r--r-- | LayoutTests/http/conf/httpd.conf | 4 | ||||
| -rw-r--r-- | LayoutTests/http/conf/mime.types | 1 |
6 files changed, 31 insertions, 0 deletions
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 |