X-Git-Url: https://git.tld-linux.org/?p=packages%2Fapache.git;a=blobdiff_plain;f=apache-httpd.conf;h=2c3ddd6b2177a3798fa9373d64edf3e3572436af;hp=d82c8eb84db32637b8e942c893471df52af6697f;hb=a6d298e795b539839512e1cb85f4b73224b39a8e;hpb=02b7b3f5a6f4dc3ef77d7bd3ba32681f99943fdc

diff --git a/apache-httpd.conf b/apache-httpd.conf
index d82c8eb..2c3ddd6 100644
--- a/apache-httpd.conf
+++ b/apache-httpd.conf
@@ -1,15 +1,15 @@
-#
 # This is the main Apache HTTP server configuration file.
 # It contains the configuration directives that give the server its instructions.
 #
 # This config aims to be clean and readable.
-# See <URL:http://httpd.apache.org/docs/2.2> for detailed information.
+# See <http://httpd.apache.org/docs/2.4> for detailed information.
 # In particular, see
-# <URL:http://httpd.apache.org/docs/2.2/mod/directives.html>
+# <http://httpd.apache.org/docs/2.4/mod/directives.html>
 # for a discussion of each configuration directive.
-LoadModule unixd_module	modules/mod_unixd.so
+
 ServerRoot "/etc/httpd"
-DefaultType none
+
+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
@@ -27,8 +27,8 @@ Group http
 Listen 80
 
 # ServerAdmin: Your address, where problems with the server should be
-# e-mailed.  This address appears on some server-generated pages, such
-# as error documents.  e.g. admin@example.com
+# e-mailed. This address appears on some server-generated pages, such
+# as error documents. e.g. admin@example.com
 #
 ServerAdmin root@example.com
 
@@ -43,40 +43,73 @@ ServerName localhost
 # ErrorLog: The location of the error log file.
 # If you do not specify an ErrorLog directive within a <VirtualHost>
 # container, error messages relating to that virtual host will be
-# logged here.  If you *do* define an error logfile for a <VirtualHost>
+# logged here. If you *do* define an error logfile for a <VirtualHost>
 # container, that host's errors will be logged there and not here.
 ErrorLog logs/error_log
 
+# ErrorLogFormat [connection|request] format
+# Format specification for error log entries
+# https://httpd.apache.org/docs/2.4/mod/core.html#errorlogformat
+# There is no default value, Apache uses different built in function if
+# ErrorLogFormat is not defined.
+#ErrorLogFormat "[%{u}t] [%m:%l] [pid\ %P] [client\ %a] [vhost\ %v] %M"
+
 # LogLevel: Control the number of messages logged to the error_log.
 # Possible values include: debug, info, notice, warn, error, crit,
 # alert, emerg.
 LogLevel warn
 
-Timeout 300
+Timeout 60
 KeepAlive On
 MaxKeepAliveRequests 100
 KeepAliveTimeout 5
 UseCanonicalName Off
 AccessFileName .htaccess
 ServerTokens Prod
-ServerSignature On
+ServerSignature Off
 HostnameLookups Off
 #AddDefaultCharset UTF-8
 
 TraceEnable Off
 
+#
+# EnableMMAP and EnableSendfile: On systems that support it, memory-mapping or
+# the sendfile syscall may be used to deliver files.
+# This usually improves server performance, but must be turned off when serving
+# from networked-mounted filesystems or if support for these functions is
+# otherwise broken on your system.
+# Defaults if commented: EnableMMAP On, EnableSendfile Off
+#
+#EnableMMAP off
+EnableSendfile on
+
 # Include other modules and packages config.
 IncludeOptional conf.d/*.conf
 
 # Include webapps config
 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.
 	# ScriptAliases are essentially the same as Aliases, except that
 	# documents in the target directory are treated as applications and
 	# run by the server when requested rather than as documents sent to the
-	# client.  The same rules about trailing "/" apply to ScriptAlias
+	# client. The same rules about trailing "/" apply to ScriptAlias
 	# directives as to Alias.
 	#
 	ScriptAlias /cgi-bin/ "/home/services/httpd/cgi-bin/"
@@ -85,6 +118,9 @@ IncludeOptional webapps.d/*.conf
 		AllowOverride None
 		Options None
 		<IfModule mod_authz_host.c>
+			Require all granted
+		</IfModule>
+		<IfModule mod_access_compat.c>
 			Order allow,deny
 			Allow from all
 		</IfModule>
@@ -101,7 +137,7 @@ IncludeOptional webapps.d/*.conf
 
 # Setup default vhost (first one defined in config) and include vhosts configuration
 <VirtualHost *:80>
-    ServerName localhost
+	ServerName localhost
 #	ServerAdmin webmaster@host.example.com
 #	DocumentRoot /www/docs/host.example.com
 #	ErrorLog logs/host.example.com-error_log