Changeset 203977 in webkit


Ignore:
Timestamp:
Aug 1, 2016 11:30:38 AM (8 years ago)
Author:
commit-queue@webkit.org
Message:

Update Apache configuration for Arch Linux
​https://bugs.webkit.org/show_bug.cgi?id=160408

Patch by Adrian Perez de Castro <Adrian Perez de Castro> 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.
Location:
trunk/LayoutTests
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r203976 r203977  
     12016-08-01  Adrian Perez de Castro  <aperez@igalia.com>
     2
     3        Update Apache configuration for Arch Linux
     4        https://bugs.webkit.org/show_bug.cgi?id=160408
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        Arch Linux now ships Apache 2.4 and PHP 7, so the configuration file
     9        used for the layout tests is updated to be compatible with the newer
     10        versions.
     11
     12        * http/conf/archlinux-httpd.conf: Updated.
     13
    1142016-08-01  Antti Koivisto  <antti@apple.com>
    215

  • trunk/LayoutTests/http/conf/archlinux-httpd.conf

    r150128 r203977  
    1 ServerRoot "/usr"
     1ServerTokens OS
     2ServerRoot "/usr/lib/httpd"
    23
    3 LockFile "/tmp/WebKit/httpd.lock"
    44PidFile "/tmp/WebKit/httpd.pid"
    55ScoreBoardFile "/tmp/WebKit/httpd.scoreboard"
    … …  
    1616MaxRequestsPerChild 100000
    1717
    18 LoadModule log_config_module  /usr/lib/httpd/modules/mod_log_config.so
    19 LoadModule mime_module        /usr/lib/httpd/modules/mod_mime.so
    20 LoadModule negotiation_module /usr/lib/httpd/modules/mod_negotiation.so
    21 LoadModule include_module    /usr/lib/httpd/modules/mod_include.so
    22 LoadModule cgi_module         /usr/lib/httpd/modules/mod_cgi.so
    23 LoadModule asis_module        /usr/lib/httpd/modules/mod_asis.so
    24 LoadModule imagemap_module    /usr/lib/httpd/modules/mod_imagemap.so
    25 LoadModule actions_module      /usr/lib/httpd/modules/mod_actions.so
    26 LoadModule alias_module       /usr/lib/httpd/modules/mod_alias.so
    27 LoadModule rewrite_module     /usr/lib/httpd/modules/mod_rewrite.so
    28 LoadModule authz_host_module  /usr/lib/httpd/modules/mod_authz_host.so
    29 LoadModule headers_module     /usr/lib/httpd/modules/mod_headers.so
    30 LoadModule ssl_module         /usr/lib/httpd/modules/mod_ssl.so
    31 LoadModule php5_module        /usr/lib/httpd/modules/libphp5.so
     18LoadModule mpm_prefork_module   modules/mod_mpm_prefork.so
     19LoadModule authz_core_module    modules/mod_authz_core.so
     20LoadModule authz_host_module    modules/mod_authz_host.so
     21LoadModule include_module       modules/mod_include.so
     22LoadModule headers_module       modules/mod_headers.so
     23LoadModule mime_module          modules/mod_mime.so
     24LoadModule negotiation_module   modules/mod_negotiation.so
     25LoadModule actions_module       modules/mod_actions.so
     26LoadModule alias_module         modules/mod_alias.so
     27LoadModule rewrite_module       modules/mod_rewrite.so
     28LoadModule unixd_module         modules/mod_unixd.so
     29LoadModule cgi_module           modules/mod_cgi.so
     30#LoadModule access_compat_module modules/mod_access_compat.so
     31LoadModule log_config_module    modules/mod_log_config.so
     32#LoadModule imagemap_module      modules/mod_imagemap.so
     33LoadModule ssl_module           modules/mod_ssl.so
     34LoadModule php7_module          modules/libphp7.so
     35LoadModule asis_module          modules/mod_asis.so
    3236
    3337ServerName 127.0.0.1
    … …  
    3640    Options Indexes FollowSymLinks MultiViews ExecCGI Includes
    3741    AllowOverride All
    38     Order allow,deny
    39     Allow from all
     42    Require all granted
    4043</Directory>
    4144
    … …  
    4346
    4447<Files ~ "^\.([Hh][Tt]|[Dd][Ss]_[Ss])">
    45     Order allow,deny
    46     Deny from all
    47     Satisfy All
     48    Require all denied
    4849</Files>
    4950
    5051UseCanonicalName On
    51 DefaultType text/plain
    5252HostnameLookups Off
     53
     54TypesConfig /etc/mime.types
    5355
    5456LogLevel warn
    … …  
    5759LogFormat "%{Referer}i -> %U" referer
    5860LogFormat "%{User-agent}i" agent
     61ErrorLog /tmp/WebKit/error_log
    5962
    6063ServerSignature On
    6164
    62 <IfModule mod_alias.c>
     65AddLanguage ca .ca
     66AddLanguage cs .cz .cs
     67AddLanguage da .dk
     68AddLanguage de .de
     69AddLanguage el .el
     70AddLanguage en .en
     71AddLanguage eo .eo
     72AddLanguage es .es
     73AddLanguage et .et
     74AddLanguage fr .fr
     75AddLanguage he .he
     76AddLanguage hr .hr
     77AddLanguage it .it
     78AddLanguage ja .ja
     79AddLanguage ko .ko
     80AddLanguage ltz .ltz
     81AddLanguage nl .nl
     82AddLanguage nn .nn
     83AddLanguage no .no
     84AddLanguage pl .po
     85AddLanguage pt .pt
     86AddLanguage pt-BR .pt-br
     87AddLanguage ru .ru
     88AddLanguage sv .sv
     89AddLanguage zh-CN .zh-cn
     90AddLanguage zh-TW .zh-tw
     91AddCharset Big5         .Big5    .big5
     92AddCharset WINDOWS-1251 .cp-1251
     93AddCharset CP866        .cp866
     94AddCharset ISO-8859-5   .iso-ru
     95AddCharset KOI8-R       .koi8-r
     96AddCharset UCS-2        .ucs2
     97AddCharset UCS-4        .ucs4
     98AddCharset UTF-8        .utf8
     99
     100<IfModule mod_negotiation.c>
     101    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
    63102</IfModule>
    64103
    65 <IfModule mod_mime.c>
    66     AddLanguage da .dk
    67     AddLanguage nl .nl
    68     AddLanguage en .en
    69     AddLanguage et .ee
    70     AddLanguage fr .fr
    71     AddLanguage de .de
    72     AddLanguage el .el
    73     AddLanguage he .he
    74     AddCharset ISO-8859-8 .iso8859-8
    75     AddLanguage it .it
    76     AddLanguage ja .ja
    77     AddCharset ISO-2022-JP .jis
    78     AddLanguage kr .kr
    79     AddCharset ISO-2022-KR .iso-kr
    80     AddLanguage nn .nn
    81     AddLanguage no .no
    82     AddLanguage pl .po
    83     AddCharset ISO-8859-2 .iso-pl
    84     AddLanguage pt .pt
    85     AddLanguage pt-br .pt-br
    86     AddLanguage ltz .lu
    87     AddLanguage ca .ca
    88     AddLanguage es .es
    89     AddLanguage sv .sv
    90     AddLanguage cs .cz .cs
    91     AddLanguage ru .ru
    92     AddLanguage zh-TW .zh-tw
    93     AddCharset Big5         .Big5    .big5
    94     AddCharset WINDOWS-1251 .cp-1251
    95     AddCharset CP866        .cp866
    96     AddCharset ISO-8859-5   .iso-ru
    97     AddCharset KOI8-R       .koi8-r
    98     AddCharset UCS-2        .ucs2
    99     AddCharset UCS-4        .ucs4
    100     AddCharset UTF-8        .utf8
     104AddType application/x-tar .tgz
    101105
    102     <IfModule mod_negotiation.c>
    103         LanguagePriority en da nl et fr de el it ja kr no pl pt pt-br ru ltz ca es sv tw
    104     </IfModule>
     106AddEncoding x-compress .Z
     107AddEncoding x-gzip .gz .tgz
    105108
    106     AddType application/x-tar .tgz
     109AddType application/x-x509-ca-cert .crt
     110AddType application/x-pkcs7-crl    .crl
    107111
    108     AddEncoding x-compress .Z
    109     AddEncoding x-gzip .gz .tgz
     112AddHandler cgi-script .cgi .pl
    110113
    111     AddHandler cgi-script .cgi .pl
     114AddType text/html .shtml
     115AddOutputFilter INCLUDES .shtml
    112116
    113     AddType text/html .shtml
    114     AddHandler server-parsed .shtml
    115 
    116     AddHandler send-as-is asis
    117 </IfModule>
     117AddHandler send-as-is asis
    118118
    119119<IfModule mod_php5.c>
    … …  
    145145#
    146146<Files "rsrc">
    147     Order allow,deny
    148     Deny from all
    149     Satisfy All
     147    Require all denied
    150148</Files>
    151149
    152150<Directory  ~ ".*\.\.namedfork">
    153     Order allow,deny
    154     Deny from all
    155     Satisfy All
     151    Require all denied
    156152</Directory>
Note: See TracChangeset for help on using the changeset viewer.