From 427100d21de9695b7283e38e59eec11100c49b14 Mon Sep 17 00:00:00 2001 From: "thestig@chromium.org" Date: Tue, 6 Oct 2009 00:12:46 +0000 Subject: Add page_cycler test machine setup notes to httpd2_linux.conf. No Code Change. BUG=none TEST=none Review URL: http://codereview.chromium.org/256069 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28071 0039d316-1c4b-4281-b951-d872f2087c98 --- tools/python/google/httpd_config/httpd2_linux.conf | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'tools/python/google') diff --git a/tools/python/google/httpd_config/httpd2_linux.conf b/tools/python/google/httpd_config/httpd2_linux.conf index b8e1acb..27a67e0 100644 --- a/tools/python/google/httpd_config/httpd2_linux.conf +++ b/tools/python/google/httpd_config/httpd2_linux.conf @@ -1,3 +1,8 @@ +# For this to work, you need to have ssl.conf and ssl.load in +# /etc/apache/mods-enabled. You also need to be able to write to +# /var/run/apache2. (Tested on Ubuntu Hardy, directory names may +# vary with other distros.) + Listen 127.0.0.1:8000 ServerName 127.0.0.1 @@ -27,7 +32,7 @@ KeepAliveTimeout 15 ## ## Server-Pool Size Regulation (MPM specific) -## +## # prefork MPM # StartServers: number of server processes to start @@ -54,7 +59,7 @@ KeepAliveTimeout 15 StartServers 2 MaxClients 150 MinSpareThreads 25 - MaxSpareThreads 75 + MaxSpareThreads 75 ThreadsPerChild 25 MaxRequestsPerChild 0 @@ -68,8 +73,8 @@ KeepAliveTimeout 15 AccessFileName .htaccess # -# The following lines prevent .htaccess and .htpasswd files from being -# viewed by Web clients. +# The following lines prevent .htaccess and .htpasswd files from being +# viewed by Web clients. # Order allow,deny @@ -130,8 +135,8 @@ ServerTokens Full # # Optionally add a line containing the server version and virtual host -# name to server-generated pages (internal error documents, FTP directory -# listings, mod_status and mod_info output etc., but not CGI generated +# name to server-generated pages (internal error documents, FTP directory +# listings, mod_status and mod_info output etc., but not CGI generated # documents or custom error documents). # Set to "EMail" to also include a mailto: link to the ServerAdmin. # Set to one of: On | Off | EMail -- cgit v1.1