auto-import changelog data from httpd-2.0.49-7.src.rpmhttpd-2_0_49-7

Wed Jun 16 2004 Joe Orton <jorton@redhat.com> 2.0.49-7
- don't install or use bundled pcreposix.h
- bump default MaxClients to 256
- drop default Timeout to 2 minutes
- merge from upstream:
add fix for VirtualHost multiple address handling (Jeff Trawick)

1 files changed, 5 insertions, 3 deletions

diff --git a/httpd.conf b/httpd.conf
index c12adc5..cb75586 100644
--- a/httpd.conf
+++ b/httpd.conf
@@ -48,7 +48,7 @@ ServerTokens OS
 #
 # NOTE!  If you intend to place this on an NFS (or otherwise network)
 # mounted filesystem then please read the LockFile documentation
-# (available at <URL:http://httpd.apache.org/docs-2.0/mod/core.html#lockfile>);
+# (available at <URL:http://httpd.apache.org/docs-2.0/mod/mpm_common.html#lockfile>);
 # you will save yourself a lot of trouble.
 #
 # Do NOT add a slash at the end of the directory path.
@@ -64,7 +64,7 @@ PidFile run/httpd.pid
 #
 # Timeout: The number of seconds before receives and sends time out.
 #
-Timeout 300
+Timeout 120
 
 #
 # KeepAlive: Whether or not to allow persistent connections (more than
@@ -93,13 +93,15 @@ KeepAliveTimeout 15
 # StartServers: number of server processes to start
 # MinSpareServers: minimum number of server processes which are kept spare
 # MaxSpareServers: maximum number of server processes which are kept spare
+# ServerLimit: maximum value for MaxClients for the lifetime of the server
 # MaxClients: maximum number of server processes allowed to start
 # MaxRequestsPerChild: maximum number of requests a server process serves
 <IfModule prefork.c>
 StartServers       8
 MinSpareServers    5
 MaxSpareServers   20
-MaxClients       150
+ServerLimit      256
+MaxClients       256
 MaxRequestsPerChild  4000
 </IfModule>