Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Side by Side Diff: LayoutTests/http/conf/debian-httpd-2.4.conf

Issue 47023017: Make http LayoutTests work in Debian with Apache 2.4. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Picked fixup committed by allan.jensen@digia.com on the same day as the initial patch. Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « LayoutTests/http/conf/debian-httpd-2.2.conf ('k') | Tools/Scripts/webkitperl/httpd.pm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 ServerTokens OS 1 ServerTokens OS
2 ServerRoot "/etc/httpd" 2 ServerRoot "/usr/lib/apache2"
3 3
4 PidFile "/tmp/WebKit/httpd.pid" 4 PidFile "/tmp/WebKit/httpd.pid"
5 ScoreBoardFile "/tmp/WebKit/httpd.scoreboard" 5 ScoreBoardFile "/tmp/WebKit/httpd.scoreboard"
6 6
7 Timeout 300 7 Timeout 300
8 KeepAlive On 8 KeepAlive On
9 MaxKeepAliveRequests 100 9 MaxKeepAliveRequests 100
10 KeepAliveTimeout 15 10 KeepAliveTimeout 15
11 11
12 MinSpareServers 1 12 MinSpareServers 1
13 MaxSpareServers 5 13 MaxSpareServers 5
14 StartServers 1 14 StartServers 1
15 MaxClients 150 15 MaxClients 150
16 MaxRequestsPerChild 100000 16 MaxRequestsPerChild 100000
17 17
18 LoadModule mpm_prefork_module modules/mod_mpm_prefork.so 18 LoadModule mpm_prefork_module modules/mod_mpm_prefork.so
19 LoadModule authz_core_module modules/mod_authz_core.so 19 LoadModule authz_core_module modules/mod_authz_core.so
20 LoadModule authz_host_module modules/mod_authz_host.so 20 LoadModule authz_host_module modules/mod_authz_host.so
21 LoadModule include_module modules/mod_include.so 21 LoadModule include_module modules/mod_include.so
22 LoadModule log_config_module modules/mod_log_config.so 22 LoadModule headers_module modules/mod_headers.so
23 LoadModule headers_module modules/mod_headers.so 23 LoadModule mime_module modules/mod_mime.so
24 LoadModule mime_module modules/mod_mime.so 24 LoadModule negotiation_module modules/mod_negotiation.so
25 LoadModule negotiation_module modules/mod_negotiation.so 25 LoadModule actions_module modules/mod_actions.so
26 LoadModule actions_module modules/mod_actions.so 26 LoadModule alias_module modules/mod_alias.so
27 LoadModule alias_module modules/mod_alias.so 27 LoadModule rewrite_module modules/mod_rewrite.so
28 LoadModule rewrite_module modules/mod_rewrite.so 28 LoadModule cgi_module modules/mod_cgi.so
29 LoadModule cgi_module modules/mod_cgi.so 29 LoadModule ssl_module modules/mod_ssl.so
30 LoadModule ssl_module modules/mod_ssl.so 30 LoadModule php5_module modules/libphp5.so
31 LoadModule unixd_module modules/mod_unixd.so 31 LoadModule asis_module modules/mod_asis.so
32 LoadModule php5_module modules/libphp5.so
33 32
34 LoadModule asis_module modules/mod_asis.so
35
36 User apache
37 Group apache
38
39 ServerAdmin root@localhost
40 ServerName 127.0.0.1 33 ServerName 127.0.0.1
41 34
42 UseCanonicalName On
43
44 <Directory /> 35 <Directory />
45 Options Indexes FollowSymLinks MultiViews ExecCGI Includes 36 Options Indexes FollowSymLinks MultiViews ExecCGI Includes
46 AllowOverride All 37 AllowOverride All
47 Require all granted 38 Require all granted
48 </Directory> 39 </Directory>
49 40
50 AccessFileName .htaccess 41 AccessFileName .htaccess
51 42
52 <Files ~ "^\.([Hh][Tt]|[Dd][Ss]_[Ss])"> 43 <Files ~ "^\.([Hh][Tt]|[Dd][Ss]_[Ss])">
53 Require all denied 44 Require all denied
54 </Files> 45 </Files>
55 46
47 UseCanonicalName On
48 HostnameLookups Off
49
56 TypesConfig /etc/mime.types 50 TypesConfig /etc/mime.types
57 HostnameLookups Off
58 51
59 LogLevel warn 52 LogLevel warn
60 LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combine d 53 LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combine d
61 LogFormat "%h %l %u %t \"%r\" %>s %b" common 54 LogFormat "%h %l %u %t \"%r\" %>s %b" common
62 LogFormat "%{Referer}i -> %U" referer 55 LogFormat "%{Referer}i -> %U" referer
63 LogFormat "%{User-agent}i" agent 56 LogFormat "%{User-agent}i" agent
57 ErrorLog /tmp/WebKit/error_log
64 58
65 ServerSignature On 59 ServerSignature On
66 60
67 AddLanguage ca .ca 61 AddLanguage ca .ca
68 AddLanguage cs .cz .cs 62 AddLanguage cs .cz .cs
69 AddLanguage da .dk 63 AddLanguage da .dk
70 AddLanguage de .de 64 AddLanguage de .de
71 AddLanguage el .el 65 AddLanguage el .el
72 AddLanguage en .en 66 AddLanguage en .en
73 AddLanguage eo .eo 67 AddLanguage eo .eo
(...skipping 22 matching lines...) Expand all
96 AddCharset ISO-8859-5 .iso-ru 90 AddCharset ISO-8859-5 .iso-ru
97 AddCharset KOI8-R .koi8-r 91 AddCharset KOI8-R .koi8-r
98 AddCharset UCS-2 .ucs2 92 AddCharset UCS-2 .ucs2
99 AddCharset UCS-4 .ucs4 93 AddCharset UCS-4 .ucs4
100 AddCharset UTF-8 .utf8 94 AddCharset UTF-8 .utf8
101 95
102 <IfModule mod_negotiation.c> 96 <IfModule mod_negotiation.c>
103 LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no p l pt pt-BR ru sv zh-CN zh-TW 97 LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no p l pt pt-BR ru sv zh-CN zh-TW
104 </IfModule> 98 </IfModule>
105 99
100 AddType application/x-tar .tgz
101
106 AddEncoding x-compress .Z 102 AddEncoding x-compress .Z
107 AddEncoding x-gzip .gz .tgz 103 AddEncoding x-gzip .gz .tgz
108 104
109 AddType application/x-x509-ca-cert .crt 105 AddType application/x-x509-ca-cert .crt
110 AddType application/x-pkcs7-crl .crl 106 AddType application/x-pkcs7-crl .crl
111 107
112 AddHandler cgi-script .cgi .pl 108 AddHandler cgi-script .cgi .pl
113 109
114 AddType text/html .shtml 110 AddType text/html .shtml
115 AddOutputFilter INCLUDES .shtml 111 AddOutputFilter INCLUDES .shtml
(...skipping 27 matching lines...) Expand all
143 # 139 #
144 # Apple-specific filesystem protection. 140 # Apple-specific filesystem protection.
145 # 141 #
146 <Files "rsrc"> 142 <Files "rsrc">
147 Require all denied 143 Require all denied
148 </Files> 144 </Files>
149 145
150 <Directory ~ ".*\.\.namedfork"> 146 <Directory ~ ".*\.\.namedfork">
151 Require all denied 147 Require all denied
152 </Directory> 148 </Directory>
OLDNEW
« no previous file with comments | « LayoutTests/http/conf/debian-httpd-2.2.conf ('k') | Tools/Scripts/webkitperl/httpd.pm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698