Title: [164148] trunk
- Revision
- 164148
- Author
- rn...@webkit.org
- Date
- 2014-02-14 18:33:39 -0800 (Fri, 14 Feb 2014)
Log Message
run-webkit-tests doesn't work with Apache 2.4
https://bugs.webkit.org/show_bug.cgi?id=128861
Reviewed by Andreas Kling.
Tools:
Use apache<version>-httpd.conf like we do on Fedora and Debian.
* Scripts/webkitpy/port/base.py:
(Port._apache_config_file_name_for_platform):
LayoutTests:
* http/conf/apache2.4-httpd.conf: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (164147 => 164148)
--- trunk/LayoutTests/ChangeLog 2014-02-15 01:27:53 UTC (rev 164147)
+++ trunk/LayoutTests/ChangeLog 2014-02-15 02:33:39 UTC (rev 164148)
@@ -1,3 +1,12 @@
+2014-02-14 Ryosuke Niwa <rn...@webkit.org>
+
+ run-webkit-tests doesn't work with Apache 2.4
+ https://bugs.webkit.org/show_bug.cgi?id=128861
+
+ Reviewed by Andreas Kling.
+
+ * http/conf/apache2.4-httpd.conf: Added.
+
2014-02-14 Dan Bernstein <m...@apple.com>
REGRESSION (r157443): Search fields with a non-white background don’t have a round bezel
Added: trunk/LayoutTests/http/conf/apache2.4-httpd.conf (0 => 164148)
--- trunk/LayoutTests/http/conf/apache2.4-httpd.conf (rev 0)
+++ trunk/LayoutTests/http/conf/apache2.4-httpd.conf 2014-02-15 02:33:39 UTC (rev 164148)
@@ -0,0 +1,162 @@
+ServerRoot "/usr"
+
+Mutex file:/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
+MaxRequestWorkers 150
+MaxConnectionsPerChild 100000
+
+LoadModule unixd_module libexec/apache2/mod_unixd.so
+LoadModule access_compat_module libexec/apache2/mod_access_compat.so
+LoadModule authn_core_module libexec/apache2/mod_authn_core.so
+LoadModule authz_core_module libexec/apache2/mod_authz_core.so
+LoadModule authz_host_module libexec/apache2/mod_authz_host.so
+LoadModule include_module libexec/apache2/mod_include.so
+LoadModule log_config_module libexec/apache2/mod_log_config.so
+LoadModule headers_module libexec/apache2/mod_headers.so
+LoadModule ssl_module libexec/apache2/mod_ssl.so
+LoadModule mime_module libexec/apache2/mod_mime.so
+LoadModule asis_module libexec/apache2/mod_asis.so
+LoadModule cgi_module libexec/apache2/mod_cgi.so
+LoadModule negotiation_module libexec/apache2/mod_negotiation.so
+#LoadModule imagemap_module libexec/apache2/mod_imagemap.so
+LoadModule actions_module libexec/apache2/mod_actions.so
+LoadModule alias_module libexec/apache2/mod_alias.so
+LoadModule rewrite_module libexec/apache2/mod_rewrite.so
+LoadModule php5_module libexec/apache2/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
+HostnameLookups Off
+
+LogLevel warn
+
+ErrorLog "/tmp/WebKit/error_log.txt"
+
+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>
Modified: trunk/Tools/ChangeLog (164147 => 164148)
--- trunk/Tools/ChangeLog 2014-02-15 01:27:53 UTC (rev 164147)
+++ trunk/Tools/ChangeLog 2014-02-15 02:33:39 UTC (rev 164148)
@@ -1,3 +1,15 @@
+2014-02-14 Ryosuke Niwa <rn...@webkit.org>
+
+ run-webkit-tests doesn't work with Apache 2.4
+ https://bugs.webkit.org/show_bug.cgi?id=128861
+
+ Reviewed by Andreas Kling.
+
+ Use apache<version>-httpd.conf like we do on Fedora and Debian.
+
+ * Scripts/webkitpy/port/base.py:
+ (Port._apache_config_file_name_for_platform):
+
2014-02-14 Brent Fulgham <bfulg...@apple.com>
[Win] Make tests more consistent with Mac platform
Modified: trunk/Tools/Scripts/webkitpy/port/base.py (164147 => 164148)
--- trunk/Tools/Scripts/webkitpy/port/base.py 2014-02-15 01:27:53 UTC (rev 164147)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2014-02-15 02:33:39 UTC (rev 164148)
@@ -1088,7 +1088,7 @@
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).
- return "apache2-httpd.conf"
+ return 'httpd-' + self._apache_version() + '.conf'
def _path_to_apache_config_file(self):
"""Returns the full path to the apache configuration file.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
