Http tests fails on Debian with Apache 2.4

https://bugs.webkit.org/show_bug.cgi?id=120352

Reviewed by Andreas Kling.

Tools:

Select httpd.conf file for debian based on version, matching Fedora behavior.

* Scripts/webkitpy/port/base.py:
(Port._apache_config_file_name_for_platform):

LayoutTests:

Added an apache 2.4 configuration file adapted from Fedora's,
and renamed the 2.2 file to have consistent naming.

* http/conf/debian-httpd-2.2.conf: Renamed from LayoutTests/http/conf/apache2-debian-httpd.conf.
* http/conf/debian-httpd-2.4.conf: Added.

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ebaf8c8b2a09e79aa08098a84ca05a6a1abcf9a0..9a080223581df08725c6c9997a5e3efd0fbc2925 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2013-08-28  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        Http tests fails on Debian with Apache 2.4
+        https://bugs.webkit.org/show_bug.cgi?id=120352
+
+        Reviewed by Andreas Kling.
+
+        Added an apache 2.4 configuration file adapted from Fedora's,
+        and renamed the 2.2 file to have consistent naming.
+
+        * http/conf/debian-httpd-2.2.conf: Renamed from LayoutTests/http/conf/apache2-debian-httpd.conf.
+        * http/conf/debian-httpd-2.4.conf: Added.
+
 2013-08-28  Sergio Villar Senin  <svillar@igalia.com>
 
         [CSS Grid Layout] Fix grid position resolution

diff --git a/LayoutTests/http/conf/apache2-debian-httpd.conf b/LayoutTests/http/conf/debian-httpd-2.2.conf
similarity index 100%
rename from LayoutTests/http/conf/apache2-debian-httpd.conf
rename to LayoutTests/http/conf/debian-httpd-2.2.conf

diff --git a/LayoutTests/http/conf/debian-httpd-2.4.conf b/LayoutTests/http/conf/debian-httpd-2.4.conf
new file mode 100644 (file)
index 0000000..22a9b46
--- /dev/null
+++ b/LayoutTests/http/conf/debian-httpd-2.4.conf
@@ -0,0 +1,148 @@
+ServerTokens OS
+ServerRoot "/usr/lib/apache2"
+
+PidFile "/tmp/WebKit/httpd.pid"
+ScoreBoardFile "/tmp/WebKit/httpd.scoreboard"
+
+Timeout 300
+KeepAlive On
+MaxKeepAliveRequests 100
+KeepAliveTimeout 15
+
+MinSpareServers 1
+MaxSpareServers 5
+StartServers 1
+MaxClients 150
+MaxRequestsPerChild 100000
+
+LoadModule mpm_prefork_module   modules/mod_mpm_prefork.so
+LoadModule authz_core_module    modules/mod_authz_core.so
+LoadModule authz_host_module    modules/mod_authz_host.so
+LoadModule include_module       modules/mod_include.so
+LoadModule headers_module       modules/mod_headers.so
+LoadModule mime_module          modules/mod_mime.so
+LoadModule negotiation_module   modules/mod_negotiation.so
+LoadModule actions_module       modules/mod_actions.so
+LoadModule alias_module         modules/mod_alias.so
+LoadModule rewrite_module       modules/mod_rewrite.so
+LoadModule cgi_module           modules/mod_cgi.so
+LoadModule ssl_module           modules/mod_ssl.so
+LoadModule php5_module          modules/libphp5.so
+LoadModule asis_module          modules/mod_asis.so
+
+ServerName 127.0.0.1
+
+<Directory />
+    Options Indexes FollowSymLinks MultiViews ExecCGI Includes
+    AllowOverride All
+    Require all granted
+</Directory>
+
+AccessFileName .htaccess
+
+<Files ~ "^\.([Hh][Tt]|[Dd][Ss]_[Ss])">
+    Require all denied
+</Files>
+
+UseCanonicalName On
+HostnameLookups Off
+
+TypesConfig /etc/mime.types
+
+LogLevel warn
+LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat "%h %l %u %t \"%r\" %>s %b" common
+LogFormat "%{Referer}i -> %U" referer
+LogFormat "%{User-agent}i" agent
+ErrorLog /tmp/WebKit/error_log
+
+ServerSignature On
+
+AddLanguage ca .ca
+AddLanguage cs .cz .cs
+AddLanguage da .dk
+AddLanguage de .de
+AddLanguage el .el
+AddLanguage en .en
+AddLanguage eo .eo
+AddLanguage es .es
+AddLanguage et .et
+AddLanguage fr .fr
+AddLanguage he .he
+AddLanguage hr .hr
+AddLanguage it .it
+AddLanguage ja .ja
+AddLanguage ko .ko
+AddLanguage ltz .ltz
+AddLanguage nl .nl
+AddLanguage nn .nn
+AddLanguage no .no
+AddLanguage pl .po
+AddLanguage pt .pt
+AddLanguage pt-BR .pt-br
+AddLanguage ru .ru
+AddLanguage sv .sv
+AddLanguage zh-CN .zh-cn
+AddLanguage zh-TW .zh-tw
+AddCharset Big5         .Big5    .big5
+AddCharset WINDOWS-1251 .cp-1251
+AddCharset CP866        .cp866
+AddCharset ISO-8859-5   .iso-ru
+AddCharset KOI8-R       .koi8-r
+AddCharset UCS-2        .ucs2
+AddCharset UCS-4        .ucs4
+AddCharset UTF-8        .utf8
+
+<IfModule mod_negotiation.c>
+    LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
+</IfModule>
+
+AddType application/x-tar .tgz
+
+AddEncoding x-compress .Z
+AddEncoding x-gzip .gz .tgz
+
+AddType application/x-x509-ca-cert .crt
+AddType application/x-pkcs7-crl    .crl
+
+AddHandler cgi-script .cgi .pl
+
+AddType text/html .shtml
+AddOutputFilter INCLUDES .shtml
+
+AddHandler send-as-is asis
+
+<IfModule mod_php5.c>
+    AddType application/x-httpd-php .php
+    AddType application/x-httpd-php .bat
+    AddType application/x-httpd-php-source .phps
+
+    <IfModule mod_dir.c>
+        DirectoryIndex index.html index.php
+    </IfModule>
+
+    php_flag log_errors on
+    php_flag short_open_tag on
+</IfModule>
+
+<IfModule mod_rewrite.c>
+    RewriteEngine On
+    RewriteCond %{REQUEST_METHOD} ^TRACE
+    RewriteRule .* - [F]
+</IfModule>
+
+<VirtualHost *:8443>
+    ServerName 127.0.0.1
+    SSLEngine On
+</VirtualHost>
+
+#
+# Apple-specific filesystem protection.
+#
+<Files "rsrc">
+    Require all denied
+</Files>
+
+<Directory  ~ ".*\.\.namedfork">
+    Require all denied
+</Directory>

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 4aca038fc248aaaf2c58c1255134683471fa72cf..0bbacf7bf42fa3277607b5e80fa78e71e90fc76f 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2013-08-28  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        Http tests fails on Debian with Apache 2.4
+        https://bugs.webkit.org/show_bug.cgi?id=120352
+
+        Reviewed by Andreas Kling.
+
+        Select httpd.conf file for debian based on version, matching Fedora behavior.
+
+        * Scripts/webkitpy/port/base.py:
+        (Port._apache_config_file_name_for_platform):
+
 2013-08-28  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r154593.

diff --git a/Tools/Scripts/webkitpy/port/base.py b/Tools/Scripts/webkitpy/port/base.py
index dd66da5ef2684c39adf37cef01a8a242cd94bb91..675b55f84833131e2b20e24bce56a2f81edd00fe 100644 (file)
--- a/Tools/Scripts/webkitpy/port/base.py
+++ b/Tools/Scripts/webkitpy/port/base.py
@@ -1222,7 +1222,7 @@ class Port(object):
             if self._is_redhat_based():
                 return 'fedora-httpd-' + self._apache_version() + '.conf'
             if self._is_debian_based():
-                return 'apache2-debian-httpd.conf'
+                return 'debian-httpd-' + self._apache_version() + '.conf'
             if self._is_arch_based():
                 return 'archlinux-httpd.conf'
         # All platforms use apache2 except for CYGWIN (and Mac OS X Tiger and prior, which we no longer support).