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

Unified Diff: LayoutTests/http/conf/win-httpd.conf

Issue 155173003: checkpoint unix version of apache win32 patch. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: re-daemonize apache on unix Created 6 years, 10 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
Index: LayoutTests/http/conf/win-httpd.conf
diff --git a/LayoutTests/http/conf/apache2-httpd.conf b/LayoutTests/http/conf/win-httpd.conf
similarity index 73%
copy from LayoutTests/http/conf/apache2-httpd.conf
copy to LayoutTests/http/conf/win-httpd.conf
index 28fddf749d80f1aa72b04afd3ec5157e3c916e49..5d09fadf845db9db9ed0b9f628c9b9e3c002822a 100644
--- a/LayoutTests/http/conf/apache2-httpd.conf
+++ b/LayoutTests/http/conf/win-httpd.conf
@@ -1,37 +1,27 @@
-ServerRoot "/usr"
-
-LockFile "/tmp/WebKit/httpd.lock"
-PidFile "/tmp/WebKit/httpd.pid"
-ScoreBoardFile "/tmp/WebKit/httpd.scoreboard"
-
Timeout 300
KeepAlive On
MaxKeepAliveRequests 100
KeepAliveTimeout 15
-MinSpareServers 1
-MaxSpareServers 5
-StartServers 1
-MaxClients 150
-MaxRequestsPerChild 100000
-
-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
+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 ssl_module modules/mod_ssl.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule asis_module modules/mod_asis.so
+LoadModule cgi_module modules/mod_cgi.so
+LoadModule negotiation_module modules/mod_negotiation.so
+LoadModule imagemap_module modules/mod_imagemap.so
+LoadModule actions_module modules/mod_actions.so
+LoadModule alias_module modules/mod_alias.so
+LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule php5_module modules/php5apache2_2.dll
ServerName 127.0.0.1
+ScriptInterpreterSource Registry-Strict
+
<Directory />
Options Indexes FollowSymLinks MultiViews ExecCGI Includes
AllowOverride All
« no previous file with comments | « LayoutTests/http/conf/apache2-httpd.conf ('k') | LayoutTests/http/tests/cache/resources/cache-simulator.cgi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698