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/conf | |
| 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/conf')
| -rw-r--r-- | LayoutTests/http/conf/apache2-debian-httpd.conf | 2 | ||||
| -rw-r--r-- | LayoutTests/http/conf/apache2-httpd.conf | 2 | ||||
| -rw-r--r-- | LayoutTests/http/conf/fedora-httpd.conf | 2 | ||||
| -rw-r--r-- | LayoutTests/http/conf/httpd.conf | 2 |
4 files changed, 4 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> |