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

Unified 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, 2 months 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: LayoutTests/http/conf/debian-httpd-2.4.conf
diff --git a/LayoutTests/http/conf/fedora-httpd-2.4.conf b/LayoutTests/http/conf/debian-httpd-2.4.conf
similarity index 75%
copy from LayoutTests/http/conf/fedora-httpd-2.4.conf
copy to LayoutTests/http/conf/debian-httpd-2.4.conf
index 020b2e48fdd0ff6cd1f6fb87ba8c350f05a26bb1..22a9b46505d42a200296929f8c229924dab62dbc 100644
--- a/LayoutTests/http/conf/fedora-httpd-2.4.conf
+++ b/LayoutTests/http/conf/debian-httpd-2.4.conf
@@ -1,5 +1,5 @@
ServerTokens OS
-ServerRoot "/etc/httpd"
+ServerRoot "/usr/lib/apache2"
PidFile "/tmp/WebKit/httpd.pid"
ScoreBoardFile "/tmp/WebKit/httpd.scoreboard"
@@ -15,31 +15,22 @@ StartServers 1
MaxClients 150
MaxRequestsPerChild 100000
-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 log_config_module modules/mod_log_config.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 cgi_module modules/mod_cgi.so
-LoadModule ssl_module modules/mod_ssl.so
-LoadModule unixd_module modules/mod_unixd.so
-LoadModule php5_module modules/libphp5.so
-
-LoadModule asis_module modules/mod_asis.so
-
-User apache
-Group apache
-
-ServerAdmin root@localhost
-ServerName 127.0.0.1
+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 cgi_module modules/mod_cgi.so
+LoadModule ssl_module modules/mod_ssl.so
+LoadModule php5_module modules/libphp5.so
+LoadModule asis_module modules/mod_asis.so
-UseCanonicalName On
+ServerName 127.0.0.1
<Directory />
Options Indexes FollowSymLinks MultiViews ExecCGI Includes
@@ -53,14 +44,17 @@ AccessFileName .htaccess
Require all denied
</Files>
-TypesConfig /etc/mime.types
+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
+ErrorLog /tmp/WebKit/error_log
ServerSignature On
@@ -103,6 +97,8 @@ AddCharset UTF-8 .utf8
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
« 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