| Index: tools/python/google/httpd_config/httpd2_linux.conf
|
| ===================================================================
|
| --- tools/python/google/httpd_config/httpd2_linux.conf (revision 28055)
|
| +++ tools/python/google/httpd_config/httpd2_linux.conf (working copy)
|
| @@ -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 @@
|
|
|
| ##
|
| ## Server-Pool Size Regulation (MPM specific)
|
| -##
|
| +##
|
|
|
| # prefork MPM
|
| # StartServers: number of server processes to start
|
| @@ -54,7 +59,7 @@
|
| StartServers 2
|
| MaxClients 150
|
| MinSpareThreads 25
|
| - MaxSpareThreads 75
|
| + MaxSpareThreads 75
|
| ThreadsPerChild 25
|
| MaxRequestsPerChild 0
|
| </IfModule>
|
| @@ -68,8 +73,8 @@
|
| 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.
|
| #
|
| <Files ~ "^\.ht">
|
| Order allow,deny
|
| @@ -130,8 +135,8 @@
|
|
|
| #
|
| # 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
|
|
|