SOURCES: apache-httpd.conf - add settings from extra/httpd-default...

[glen]

Author: glen                         Date: Wed Dec 14 22:01:40 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- add settings from extra/httpd-default.conf

---- Files affected:
SOURCES:
   apache-httpd.conf (1.42 -> 1.43) 

---- Diffs:

================================================================
Index: SOURCES/apache-httpd.conf
diff -u SOURCES/apache-httpd.conf:1.42 SOURCES/apache-httpd.conf:1.43
--- SOURCES/apache-httpd.conf:1.42	Wed Dec 14 22:47:38 2005
+++ SOURCES/apache-httpd.conf	Wed Dec 14 23:01:35 2005
@@ -53,6 +53,16 @@
 # alert, emerg.
 LogLevel warn
 
+Timeout 300
+KeepAlive On
+MaxKeepAliveRequests 100
+KeepAliveTimeout 5
+UseCanonicalName Off
+AccessFileName .htaccess
+ServerTokens Full
+ServerSignature On
+HostnameLookups Off
+
 # Include other modules and packages config.
 # TODO: use conf.d here oneday
 Include httpd.conf/*.conf
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/apache-httpd.conf?r1=1.42&r2=1.43&f=u