Attachment 209741 Details for Bug 120352 – Patch

[patch] Patch

bug-120352-20130827124948.patch (text/plain), 15.01 KB, created by Allan Sandfeld Jensen on 2013-08-27 03:49:50 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Allan Sandfeld Jensen

Created: 2013-08-27 03:49:50 PDT

Size: 15.01 KB

patch

obsolete

>Subversion Revision: 154674
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index a6581b9f73d19111c8c2f2dd49f03784d89692c0..cde0e6282c580765b2387b920e123476d2b3259c 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,15 @@
>+2013-08-27  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 NOBODY (OOPS!).
>+
>+        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-27  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         Unreviewed. Fix GTK+ build after r154601.
>diff --git a/Tools/Scripts/webkitpy/port/base.py b/Tools/Scripts/webkitpy/port/base.py
>index dd66da5ef2684c39adf37cef01a8a242cd94bb91..675b55f84833131e2b20e24bce56a2f81edd00fe 100644
>--- 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).
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 3314da8ebcb9e00e53370c2091fe80976468f788..3f5dc82e88c971178b6df51f3f10eaad5f5b8c47 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,16 @@
>+2013-08-27  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 NOBODY (OOPS!).
>+
>+        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-27  Christophe Dumez  <ch.dumez@sisa.samsung.com>
> 
>         Implement DOM3 wheel event
>diff --git a/LayoutTests/http/conf/apache2-debian-httpd.conf b/LayoutTests/http/conf/apache2-debian-httpd.conf
>deleted file mode 100644
>index ddaeaf172bdbd8e0bf2750b5e829b24e44095d3c..0000000000000000000000000000000000000000
>--- a/LayoutTests/http/conf/apache2-debian-httpd.conf
>+++ /dev/null
>@@ -1,155 +0,0 @@
>-ServerRoot "/usr"
>-
>-LockFile "/tmp/WebKit/httpd.lock"
>-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 mime_module        /usr/lib/apache2/modules/mod_mime.so
>-LoadModule negotiation_module /usr/lib/apache2/modules/mod_negotiation.so
>-LoadModule include_module    /usr/lib/apache2/modules/mod_include.so
>-LoadModule cgi_module         /usr/lib/apache2/modules/mod_cgi.so
>-LoadModule asis_module        /usr/lib/apache2/modules/mod_asis.so
>-LoadModule imagemap_module    /usr/lib/apache2/modules/mod_imagemap.so
>-LoadModule actions_module      /usr/lib/apache2/modules/mod_actions.so
>-LoadModule alias_module       /usr/lib/apache2/modules/mod_alias.so
>-LoadModule rewrite_module     /usr/lib/apache2/modules/mod_rewrite.so
>-LoadModule authz_host_module  /usr/lib/apache2/modules/mod_authz_host.so
>-LoadModule headers_module     /usr/lib/apache2/modules/mod_headers.so
>-LoadModule ssl_module         /usr/lib/apache2/modules/mod_ssl.so
>-LoadModule php5_module        /usr/lib/apache2/modules/libphp5.so
>-
>-ServerName 127.0.0.1
>-
>-<Directory />
>-    Options Indexes FollowSymLinks MultiViews ExecCGI Includes
>-    AllowOverride All
>-    Order allow,deny
>-    Allow from all
>-</Directory>
>-
>-AccessFileName .htaccess
>-
>-<Files ~ "^\.([Hh][Tt]|[Dd][Ss]_[Ss])">
>-    Order allow,deny
>-    Deny from all
>-    Satisfy All
>-</Files>
>-
>-UseCanonicalName On
>-DefaultType text/plain
>-HostnameLookups Off
>-
>-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
>-
>-ServerSignature On
>-
>-<IfModule mod_alias.c>
>-</IfModule>
>-
>-<IfModule mod_mime.c>
>-    AddLanguage da .dk
>-    AddLanguage nl .nl
>-    AddLanguage en .en
>-    AddLanguage et .ee
>-    AddLanguage fr .fr
>-    AddLanguage de .de
>-    AddLanguage el .el
>-    AddLanguage he .he
>-    AddCharset ISO-8859-8 .iso8859-8
>-    AddLanguage it .it
>-    AddLanguage ja .ja
>-    AddCharset ISO-2022-JP .jis
>-    AddLanguage kr .kr
>-    AddCharset ISO-2022-KR .iso-kr
>-    AddLanguage nn .nn
>-    AddLanguage no .no
>-    AddLanguage pl .po
>-    AddCharset ISO-8859-2 .iso-pl
>-    AddLanguage pt .pt
>-    AddLanguage pt-br .pt-br
>-    AddLanguage ltz .lu
>-    AddLanguage ca .ca
>-    AddLanguage es .es
>-    AddLanguage sv .sv
>-    AddLanguage cs .cz .cs
>-    AddLanguage ru .ru
>-    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 da nl et fr de el it ja kr no pl pt pt-br ru ltz ca es sv tw
>-    </IfModule>
>-
>-    AddType application/x-tar .tgz
>-
>-    AddEncoding x-compress .Z
>-    AddEncoding x-gzip .gz .tgz
>-
>-    AddHandler cgi-script .cgi .pl
>-
>-    AddType text/html .shtml
>-    AddHandler server-parsed .shtml
>-
>-    AddHandler send-as-is asis
>-</IfModule>
>-
>-<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">
>-    Order allow,deny
>-    Deny from all
>-    Satisfy All
>-</Files>
>-
>-<Directory  ~ ".*\.\.namedfork">
>-    Order allow,deny
>-    Deny from all
>-    Satisfy All
>-</Directory>
>diff --git a/LayoutTests/http/conf/debian-httpd-2.2.conf b/LayoutTests/http/conf/debian-httpd-2.2.conf
>new file mode 100644
>index 0000000000000000000000000000000000000000..ddaeaf172bdbd8e0bf2750b5e829b24e44095d3c
>--- /dev/null
>+++ b/LayoutTests/http/conf/debian-httpd-2.2.conf
>@@ -0,0 +1,155 @@
>+ServerRoot "/usr"
>+
>+LockFile "/tmp/WebKit/httpd.lock"
>+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 mime_module        /usr/lib/apache2/modules/mod_mime.so
>+LoadModule negotiation_module /usr/lib/apache2/modules/mod_negotiation.so
>+LoadModule include_module    /usr/lib/apache2/modules/mod_include.so
>+LoadModule cgi_module         /usr/lib/apache2/modules/mod_cgi.so
>+LoadModule asis_module        /usr/lib/apache2/modules/mod_asis.so
>+LoadModule imagemap_module    /usr/lib/apache2/modules/mod_imagemap.so
>+LoadModule actions_module      /usr/lib/apache2/modules/mod_actions.so
>+LoadModule alias_module       /usr/lib/apache2/modules/mod_alias.so
>+LoadModule rewrite_module     /usr/lib/apache2/modules/mod_rewrite.so
>+LoadModule authz_host_module  /usr/lib/apache2/modules/mod_authz_host.so
>+LoadModule headers_module     /usr/lib/apache2/modules/mod_headers.so
>+LoadModule ssl_module         /usr/lib/apache2/modules/mod_ssl.so
>+LoadModule php5_module        /usr/lib/apache2/modules/libphp5.so
>+
>+ServerName 127.0.0.1
>+
>+<Directory />
>+    Options Indexes FollowSymLinks MultiViews ExecCGI Includes
>+    AllowOverride All
>+    Order allow,deny
>+    Allow from all
>+</Directory>
>+
>+AccessFileName .htaccess
>+
>+<Files ~ "^\.([Hh][Tt]|[Dd][Ss]_[Ss])">
>+    Order allow,deny
>+    Deny from all
>+    Satisfy All
>+</Files>
>+
>+UseCanonicalName On
>+DefaultType text/plain
>+HostnameLookups Off
>+
>+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
>+
>+ServerSignature On
>+
>+<IfModule mod_alias.c>
>+</IfModule>
>+
>+<IfModule mod_mime.c>
>+    AddLanguage da .dk
>+    AddLanguage nl .nl
>+    AddLanguage en .en
>+    AddLanguage et .ee
>+    AddLanguage fr .fr
>+    AddLanguage de .de
>+    AddLanguage el .el
>+    AddLanguage he .he
>+    AddCharset ISO-8859-8 .iso8859-8
>+    AddLanguage it .it
>+    AddLanguage ja .ja
>+    AddCharset ISO-2022-JP .jis
>+    AddLanguage kr .kr
>+    AddCharset ISO-2022-KR .iso-kr
>+    AddLanguage nn .nn
>+    AddLanguage no .no
>+    AddLanguage pl .po
>+    AddCharset ISO-8859-2 .iso-pl
>+    AddLanguage pt .pt
>+    AddLanguage pt-br .pt-br
>+    AddLanguage ltz .lu
>+    AddLanguage ca .ca
>+    AddLanguage es .es
>+    AddLanguage sv .sv
>+    AddLanguage cs .cz .cs
>+    AddLanguage ru .ru
>+    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 da nl et fr de el it ja kr no pl pt pt-br ru ltz ca es sv tw
>+    </IfModule>
>+
>+    AddType application/x-tar .tgz
>+
>+    AddEncoding x-compress .Z
>+    AddEncoding x-gzip .gz .tgz
>+
>+    AddHandler cgi-script .cgi .pl
>+
>+    AddType text/html .shtml
>+    AddHandler server-parsed .shtml
>+
>+    AddHandler send-as-is asis
>+</IfModule>
>+
>+<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">
>+    Order allow,deny
>+    Deny from all
>+    Satisfy All
>+</Files>
>+
>+<Directory  ~ ".*\.\.namedfork">
>+    Order allow,deny
>+    Deny from all
>+    Satisfy All
>+</Directory>
>diff --git a/LayoutTests/http/conf/debian-httpd-2.4.conf b/LayoutTests/http/conf/debian-httpd-2.4.conf
>new file mode 100644
>index 0000000000000000000000000000000000000000..d9452c7e2a50ff4bbbe43bc8dd2a8ddb45d04acb
>--- /dev/null
>+++ b/LayoutTests/http/conf/debian-httpd-2.4.conf
>@@ -0,0 +1,147 @@
>+ServerTokens OS
>+ServerRoot "/tmp/WebKit"
>+
>+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   /usr/lib/apache2/modules/mod_mpm_prefork.so
>+LoadModule authz_core_module    /usr/lib/apache2/modules/mod_authz_core.so
>+LoadModule authz_host_module    /usr/lib/apache2/modules/mod_authz_host.so
>+LoadModule include_module       /usr/lib/apache2/modules/mod_include.so
>+LoadModule headers_module       /usr/lib/apache2/modules/mod_headers.so
>+LoadModule mime_module          /usr/lib/apache2/modules/mod_mime.so
>+LoadModule negotiation_module   /usr/lib/apache2/modules/mod_negotiation.so
>+LoadModule actions_module       /usr/lib/apache2/modules/mod_actions.so
>+LoadModule alias_module         /usr/lib/apache2/modules/mod_alias.so
>+LoadModule rewrite_module       /usr/lib/apache2/modules/mod_rewrite.so
>+LoadModule cgi_module           /usr/lib/apache2/modules/mod_cgi.so
>+LoadModule ssl_module           /usr/lib/apache2/modules/mod_ssl.so
>+LoadModule php5_module          /usr/lib/apache2/modules/libphp5.so
>+LoadModule asis_module          /usr/lib/apache2/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
>+
>+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>

Actions: View | Formatted Diff | Diff

Attachments on bug 120352: 209741 | 209744 | 209752 | 209870