- updated to 2.4.23

[packages/apache.git] / apache-httpd.conf

diff --git a/apache-httpd.conf b/apache-httpd.conf
index ec2c372f7a3dad99f271e0cd9ce6f8340afc6b20..28199f7fd7a4861baf92015000102ffe5fb0f1a6 100644 (file)
--- a/apache-httpd.conf
+++ b/apache-httpd.conf
@@ -1,5 +1,3 @@
-# $Id: apache-httpd.conf,v 1.58 2011/10/25 09:40:41 psz Exp $
-#
 # This is the main Apache HTTP server configuration file.
 # It contains the configuration directives that give the server its instructions.
 #
@@ -10,7 +8,9 @@
 # for a discussion of each configuration directive.
 
 ServerRoot "/etc/httpd"
-DefaultType text/plain
+
+LoadModule unixd_module   modules/mod_unixd.so
+
 
 # User/Group: The name (or #number) of the user/group to run httpd as.
 # It is usually good practice to create a dedicated user and group for
@@ -53,7 +53,7 @@ ErrorLog logs/error_log
 # alert, emerg.
 LogLevel warn
 
-Timeout 300
+Timeout 60
 KeepAlive On
 MaxKeepAliveRequests 100
 KeepAliveTimeout 5
@@ -67,10 +67,25 @@ HostnameLookups Off
 TraceEnable Off
 
 # Include other modules and packages config.
-Include conf.d/*.conf
+IncludeOptional conf.d/*.conf
 
 # Include webapps config
-Include webapps.d/*.conf
+IncludeOptional webapps.d/*.conf
+
+#
+# Set a timeout for how long the client may take to send the request header
+# and body.
+# The default for the headers is header=20-40,MinRate=500, which means wait
+# for the first byte of headers for 20 seconds. If some data arrives,
+# increase the timeout corresponding to a data rate of 500 bytes/s, but not
+# above 40 seconds.
+# The default for the request body is body=20,MinRate=500, which is the same
+# but has no upper limit for the timeout.
+# To disable, set to header=0 body=0
+#
+<IfModule reqtimeout_module>
+  RequestReadTimeout header=20-40,MinRate=500 body=20,MinRate=500
+</IfModule>
 
 <IfModule alias_module>
        # ScriptAlias: This controls which directories contain server scripts.
@@ -86,8 +101,7 @@ Include webapps.d/*.conf
                AllowOverride None
                Options None
                <IfModule mod_authz_host.c>
-                       Order allow,deny
-                       Allow from all
+                       Require all granted
                </IfModule>
        </Directory>
 </IfModule>
@@ -101,7 +115,6 @@ Include webapps.d/*.conf
 # See also the BindAddress entry.
 
 # Setup default vhost (first one defined in config) and include vhosts configuration
-NameVirtualHost *:80
 <VirtualHost *:80>
     ServerName localhost
 #      ServerAdmin webmaster@host.example.com
@@ -110,4 +123,4 @@ NameVirtualHost *:80
 #      TransferLog logs/host.example.com-access_log
 </VirtualHost>
 
-Include vhosts.d/*.conf
+IncludeOptional vhosts.d/*.conf