Title: [203977] trunk/LayoutTests
- Revision
- 203977
- Author
- commit-qu...@webkit.org
- Date
- 2016-08-01 11:30:38 -0700 (Mon, 01 Aug 2016)
Log Message
Update Apache configuration for Arch Linux
https://bugs.webkit.org/show_bug.cgi?id=160408
Patch by Adrian Perez de Castro <ape...@igalia.com> on 2016-08-01
Reviewed by Ryosuke Niwa.
Arch Linux now ships Apache 2.4 and PHP 7, so the configuration file
used for the layout tests is updated to be compatible with the newer
versions.
* http/conf/archlinux-httpd.conf: Updated.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (203976 => 203977)
--- trunk/LayoutTests/ChangeLog 2016-08-01 18:00:48 UTC (rev 203976)
+++ trunk/LayoutTests/ChangeLog 2016-08-01 18:30:38 UTC (rev 203977)
@@ -1,3 +1,16 @@
+2016-08-01 Adrian Perez de Castro <ape...@igalia.com>
+
+ Update Apache configuration for Arch Linux
+ https://bugs.webkit.org/show_bug.cgi?id=160408
+
+ Reviewed by Ryosuke Niwa.
+
+ Arch Linux now ships Apache 2.4 and PHP 7, so the configuration file
+ used for the layout tests is updated to be compatible with the newer
+ versions.
+
+ * http/conf/archlinux-httpd.conf: Updated.
+
2016-08-01 Antti Koivisto <an...@apple.com>
REGRESSION (r196383): Drop down CSS menus not working on cnet.com, apmex.com
Modified: trunk/LayoutTests/http/conf/archlinux-httpd.conf (203976 => 203977)
--- trunk/LayoutTests/http/conf/archlinux-httpd.conf 2016-08-01 18:00:48 UTC (rev 203976)
+++ trunk/LayoutTests/http/conf/archlinux-httpd.conf 2016-08-01 18:30:38 UTC (rev 203977)
@@ -1,6 +1,6 @@
-ServerRoot "/usr"
+ServerTokens OS
+ServerRoot "/usr/lib/httpd"
-LockFile "/tmp/WebKit/httpd.lock"
PidFile "/tmp/WebKit/httpd.pid"
ScoreBoardFile "/tmp/WebKit/httpd.scoreboard"
@@ -15,20 +15,24 @@
MaxClients 150
MaxRequestsPerChild 100000
-LoadModule log_config_module /usr/lib/httpd/modules/mod_log_config.so
-LoadModule mime_module /usr/lib/httpd/modules/mod_mime.so
-LoadModule negotiation_module /usr/lib/httpd/modules/mod_negotiation.so
-LoadModule include_module /usr/lib/httpd/modules/mod_include.so
-LoadModule cgi_module /usr/lib/httpd/modules/mod_cgi.so
-LoadModule asis_module /usr/lib/httpd/modules/mod_asis.so
-LoadModule imagemap_module /usr/lib/httpd/modules/mod_imagemap.so
-LoadModule actions_module /usr/lib/httpd/modules/mod_actions.so
-LoadModule alias_module /usr/lib/httpd/modules/mod_alias.so
-LoadModule rewrite_module /usr/lib/httpd/modules/mod_rewrite.so
-LoadModule authz_host_module /usr/lib/httpd/modules/mod_authz_host.so
-LoadModule headers_module /usr/lib/httpd/modules/mod_headers.so
-LoadModule ssl_module /usr/lib/httpd/modules/mod_ssl.so
-LoadModule php5_module /usr/lib/httpd/modules/libphp5.so
+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 unixd_module modules/mod_unixd.so
+LoadModule cgi_module modules/mod_cgi.so
+#LoadModule access_compat_module modules/mod_access_compat.so
+LoadModule log_config_module modules/mod_log_config.so
+#LoadModule imagemap_module modules/mod_imagemap.so
+LoadModule ssl_module modules/mod_ssl.so
+LoadModule php7_module modules/libphp7.so
+LoadModule asis_module modules/mod_asis.so
ServerName 127.0.0.1
@@ -35,87 +39,83 @@
<Directory />
Options Indexes FollowSymLinks MultiViews ExecCGI Includes
AllowOverride All
- Order allow,deny
- Allow from all
+ Require all granted
</Directory>
AccessFileName .htaccess
<Files ~ "^\.([Hh][Tt]|[Dd][Ss]_[Ss])">
- Order allow,deny
- Deny from all
- Satisfy All
+ Require all denied
</Files>
UseCanonicalName On
-DefaultType text/plain
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
-<IfModule mod_alias.c>
+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>
-<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
+AddType application/x-tar .tgz
- <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>
+AddEncoding x-compress .Z
+AddEncoding x-gzip .gz .tgz
- AddType application/x-tar .tgz
+AddType application/x-x509-ca-cert .crt
+AddType application/x-pkcs7-crl .crl
- AddEncoding x-compress .Z
- AddEncoding x-gzip .gz .tgz
+AddHandler cgi-script .cgi .pl
- AddHandler cgi-script .cgi .pl
+AddType text/html .shtml
+AddOutputFilter INCLUDES .shtml
- AddType text/html .shtml
- AddHandler server-parsed .shtml
+AddHandler send-as-is asis
- AddHandler send-as-is asis
-</IfModule>
-
<IfModule mod_php5.c>
AddType application/x-httpd-php .php
AddType application/x-httpd-php .bat
@@ -144,13 +144,9 @@
# Apple-specific filesystem protection.
#
<Files "rsrc">
- Order allow,deny
- Deny from all
- Satisfy All
+ Require all denied
</Files>
<Directory ~ ".*\.\.namedfork">
- Order allow,deny
- Deny from all
- Satisfy All
+ Require all denied
</Directory>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
