- add settings from extra/httpd-default.conf

Changed files:
    apache-httpd.conf -> 1.43

diff --git a/apache-httpd.conf b/apache-httpd.conf
index 3168cec40a75d215c6d5649308cf1ea41b1511c2..3dbecbd6ccd39f8d08fa0f954094d060056c9a30 100644 (file)
--- a/apache-httpd.conf
+++ b/apache-httpd.conf
@@ -53,6 +53,16 @@ ErrorLog logs/error_log
 # 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