X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=apache-httpd.conf;h=60453a0fb867b220074a78776c82b7371aaa2e3a;hb=d333327a9acf86e0f993be6289cbf9375644e9d9;hp=ec2c372f7a3dad99f271e0cd9ce6f8340afc6b20;hpb=03fa0e1eac0d3851c5ae1ab08a02cc3a5ee4eb69;p=packages%2Fapache.git

diff --git a/apache-httpd.conf b/apache-httpd.conf
index ec2c372..60453a0 100644
--- 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.
 #
@@ -9,8 +7,9 @@
 # <URL:http://httpd.apache.org/docs/2.2/mod/directives.html>
 # for a discussion of each configuration directive.
 
+LoadModule unixd_module   modules/mod_unixd.so
+
 ServerRoot "/etc/httpd"
-DefaultType text/plain
 
 # 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 +52,7 @@ ErrorLog logs/error_log
 # alert, emerg.
 LogLevel warn
 
-Timeout 300
+Timeout 60
 KeepAlive On
 MaxKeepAliveRequests 100
 KeepAliveTimeout 5
@@ -67,10 +66,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 +100,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 +114,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 +122,4 @@ NameVirtualHost *:80
 #	TransferLog logs/host.example.com-access_log
 </VirtualHost>
 
-Include vhosts.d/*.conf
+IncludeOptional vhosts.d/*.conf