- config updates from 2.4.3

diff --git a/apache-httpd.conf b/apache-httpd.conf
index 177a860967681c26cae1f647b02d607a08015de5..60453a0fb867b220074a78776c82b7371aaa2e3a 100644 (file)
--- a/apache-httpd.conf
+++ b/apache-httpd.conf
@@ -52,7 +52,7 @@ ErrorLog logs/error_log
 # alert, emerg.
 LogLevel warn
 
-Timeout 300
+Timeout 60
 KeepAlive On
 MaxKeepAliveRequests 100
 KeepAliveTimeout 5
@@ -71,6 +71,21 @@ 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

diff --git a/apache-languages.conf b/apache-languages.conf
index c3716e3252490c5e3c63e262c60d939729cc6ad7..872d7b06910dcd634a373cff6aabeee2e26ace9e 100644 (file)
--- a/apache-languages.conf
+++ b/apache-languages.conf
@@ -64,6 +64,7 @@ AddLanguage pt .pt
 AddLanguage pt-BR .pt-br
 AddLanguage ru .ru
 AddLanguage sv .sv
+AddLanguage tr .tr
 AddLanguage zh-CN .zh-cn
 AddLanguage zh-TW .zh-tw
 
@@ -73,7 +74,7 @@ AddLanguage zh-TW .zh-tw
 # Just list the languages in decreasing order of preference. We have
 # more or less alphabetized them here. You probably want to change this.
 #
-LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
+LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv tr zh-CN zh-TW
 
 #
 # ForceLanguagePriority allows you to serve a result page rather than

diff --git a/apache-manual.conf b/apache-manual.conf
index 77edb70db0a83efa3935a00837a09c285baf2fa7..709d97f229366b73af61399d5b8037614647ffb2 100644 (file)
--- a/apache-manual.conf
+++ b/apache-manual.conf
@@ -5,9 +5,10 @@
 #  http://httpd.apache.org/docs/2.2/
 #
 # Required modules: mod_alias, mod_setenvif, mod_negotiation
+#                   mod_setenvif, mod_negotiation
 #
 
-AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br|ru))?(/.*)?$ "/home/services/httpd/manual$1"
+AliasMatch ^/manual(?:/(?:da|de|en|es|fr|ja|ko|pt-br|ru|tr|zh-cn))?(/.*)?$ "/home/services/httpd/manual$1"
 
 <Directory "/home/services/httpd/manual">
        Options Indexes
@@ -17,10 +18,16 @@ AliasMatch ^/manual(?:/(?:de|en|es|fr|ja|ko|pt-br|ru))?(/.*)?$ "/home/services/h
        <Files *.html>
                SetHandler type-map
        </Files>
+       # .tr is text/troff in mime.types!
+       <Files *.html.tr.utf8>
+               ForceType text/html
+       </Files>
+
+       AddLanguage da .da
 
-       SetEnvIf Request_URI ^/manual/(de|en|es|fr|ja|ko|pt-br|ru)/ prefer-language=$1
-       RedirectMatch 301 ^/manual(?:/(de|en|es|fr|ja|ko|pt-br|ru)){2,}(/.*)?$ /manual/$1$2
+       SetEnvIf Request_URI ^/manual/(da|de|en|es|fr|ja|ko|pt-br|ru|tr|zh-cn)/ prefer-language=$
+       RedirectMatch 301 ^/manual(?:/(da|de|en|es|fr|ja|ko|pt-br|ru|tr|zh-cn)){2,}(/.*)?$ /manual/$1$2
 
-       LanguagePriority en de es fr ja ko pt-br ru 
+       LanguagePriority en da de es fr ja ko pt-br ru tr
        ForceLanguagePriority Prefer Fallback
 </Directory>

diff --git a/apache-mod_autoindex.conf b/apache-mod_autoindex.conf
index e23c0a10b8fcb2e89a47faee13ca0e98e74291bf..7b902c63842fd8efd76238915e6a0b9fe1134220 100644 (file)
--- a/apache-mod_autoindex.conf
+++ b/apache-mod_autoindex.conf
@@ -14,7 +14,7 @@ LoadModule autoindex_module   modules/mod_autoindex.so
 # IndexOptions: Controls the appearance of server-generated directory
 # listings.
 #
-IndexOptions FancyIndexing VersionSort Charset=UTF-8
+IndexOptions FancyIndexing HTMLTable VersionSort Charset=UTF-8
 
 # We include the /icons/ alias for FancyIndexed directory listings.  If
 # you do not use FancyIndexing, you may comment this out.

diff --git a/apache-mod_dav.conf b/apache-mod_dav.conf
index a7ebe7216d000d34e008002a1a683f36a5433874..46b3f4c22f2d551e7a78c75f6b85f4f48606ec5c 100644 (file)
--- a/apache-mod_dav.conf
+++ b/apache-mod_dav.conf
@@ -32,9 +32,10 @@ LoadModule dav_lock_module   modules/mod_dav_lock.so
 #
 #      # Allow universal read-access, but writes are restricted
 #      # to the admin user.
-#      <LimitExcept GET OPTIONS>
-#              require user admin
-#      </LimitExcept>
+#      <RequireAny>
+#              Require method GET POST OPTIONS
+#              Require user admin
+#      </RequireAny>
 #</Directory>
 
 #
@@ -46,9 +47,10 @@ LoadModule dav_lock_module   modules/mod_dav_lock.so
 #BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
 #BrowserMatch "MS FrontPage" redirect-carefully
 #BrowserMatch "^WebDrive" redirect-carefully
-#BrowserMatch "^WebDAVFS/1.[0123]" redirect-carefully
+#BrowserMatch "^WebDAVFS/1.[01234]" redirect-carefully
 #BrowserMatch "^gnome-vfs/1.0" redirect-carefully
 #BrowserMatch "^XML Spy" redirect-carefully
 #BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully
+#BrowserMatch " Konqueror/4" redirect-carefully
 
 #</IfModule>

diff --git a/apache-mod_info.conf b/apache-mod_info.conf
index 427a247b5b01cf617050fc31b996719f7b8c105c..9ba6d7a008bd4182d6acb5acad5d313dec5d2cd5 100644 (file)
--- a/apache-mod_info.conf
+++ b/apache-mod_info.conf
@@ -13,6 +13,8 @@ LoadModule info_module                modules/mod_info.so
 #
 <Location /server-info>
        SetHandler server-info
+       # Require host .example.com
+       # Require ip 127
        Require local
 </Location>
 

diff --git a/apache-mod_ssl.conf b/apache-mod_ssl.conf
index 6645b96d8e906bde1264408b3d1f1a4d161e9f1c..6a2784965153ba1fb81a524640e564ac9747a10a 100644 (file)
--- a/apache-mod_ssl.conf
+++ b/apache-mod_ssl.conf
@@ -58,7 +58,7 @@ SSLSessionCacheTimeout  300
 ## SSL Virtual Host Context
 ##
 
-<VirtualHost *:443>
+<VirtualHost _default_:443>
 #   SSL Engine Switch:
 #   Enable/Disable SSL for this virtual host.
 SSLEngine on

diff --git a/apache-mod_status.conf b/apache-mod_status.conf
index ac53179a79f1b01592847313d92e7a6f70edee83..a5fd90b9bb65eccb6f680de00989d4d0f52b2c9a 100644 (file)
--- a/apache-mod_status.conf
+++ b/apache-mod_status.conf
@@ -14,6 +14,8 @@ LoadModule status_module              modules/mod_status.so
 
 <Location /server-status>
        SetHandler server-status
+       # Require host .example.com
+       # Require ip 127
        Require local
 </Location>