X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache-httpd.conf;h=60453a0fb867b220074a78776c82b7371aaa2e3a;hb=486fe4f4f5ad9f8e65ae11e316c6a47babc4e587;hp=98bd2995e33e24abda5394b9b34fb88f7fb1d4cc;hpb=80da5b98b7065c35ddd1e968ff99637f9c29c473;p=packages%2Fapache.git

diff --git a/apache-httpd.conf b/apache-httpd.conf
index 98bd299..60453a0 100644
--- a/apache-httpd.conf
+++ b/apache-httpd.conf
@@ -1,5 +1,3 @@
-# $Id$
-#
 # 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,23 +52,39 @@ ErrorLog logs/error_log
 # alert, emerg.
 LogLevel warn
 
-Timeout 300
+Timeout 60
 KeepAlive On
 MaxKeepAliveRequests 100
 KeepAliveTimeout 5
 UseCanonicalName Off
 AccessFileName .htaccess
-ServerTokens Full
+ServerTokens Prod
 ServerSignature On
 HostnameLookups Off
+#AddDefaultCharset UTF-8
 
 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.
@@ -85,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>
@@ -99,10 +113,13 @@ Include webapps.d/*.conf
 # Any apache.conf conf directive may go into a VirtualHost command.
 # See also the BindAddress entry.
 
-#<VirtualHost 1.2.3.4>
-#ServerAdmin webmaster@host.example.com
-#DocumentRoot /www/docs/host.examp-le.com
-#ServerName host.exampl.com
-#ErrorLog logs/host.example.com-error_log
-#TransferLog logs/host.example.com-access_log
-#</VirtualHost>
+# Setup default vhost (first one defined in config) and include vhosts configuration
+<VirtualHost *:80>
+    ServerName localhost
+#	ServerAdmin webmaster@host.example.com
+#	DocumentRoot /www/docs/host.example.com
+#	ErrorLog logs/host.example.com-error_log
+#	TransferLog logs/host.example.com-access_log
+</VirtualHost>
+
+IncludeOptional vhosts.d/*.conf