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

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

Issue 327423008: Change port to use apache by default on win7, update test expectations. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: merge forward to r177025 Created 6 years, 6 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/win-httpd.conf b/LayoutTests/http/conf/win-httpd.conf
index 69d415939057e14f5c0930811c76cb961819cc54..f8fd459f5b5380965e47296efe4ce2565f0f18aa 100644
--- a/LayoutTests/http/conf/win-httpd.conf
+++ b/LayoutTests/http/conf/win-httpd.conf
@@ -3,21 +3,17 @@ KeepAlive On
MaxKeepAliveRequests 100
KeepAliveTimeout 15
+LoadModule alias_module modules/mod_alias.so
+LoadModule asis_module modules/mod_asis.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 autoindex_module modules/mod_autoindex.so
+LoadModule cgi_module modules/mod_cgi.so
LoadModule headers_module modules/mod_headers.so
-LoadModule ssl_module modules/mod_ssl.so
+LoadModule log_config_module modules/mod_log_config.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
-LoadModule autoindex_module modules/mod_autoindex.so
+LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule ssl_module modules/mod_ssl.so
ServerName 127.0.0.1

Powered by Google App Engine
This is Rietveld 408576698