auto-import changelog data from httpd-2.0.50-5.src.rpmhttpd-2_0_50-5

Wed Sep 01 2004 Joe Orton <jorton@redhat.com> 2.0.50-5
- move manual configuration into conf.d/manual.conf (#131208)
- add test_hook from HEAD, -t -DDUMP_CERTS for mod_ssl
- document AddDefaultCharset change since 1.3 in migration.html

1 files changed, 2 insertions, 30 deletions

diff --git a/httpd.conf b/httpd.conf
index 01d6220..cabf318 100644
--- a/httpd.conf
+++ b/httpd.conf
@@ -526,41 +526,13 @@ Alias /icons/ "/var/www/icons/"
 </Directory>
 
 #
-# This should be changed to the ServerRoot/manual/.  The alias provides
-# the manual, even if you choose to move your DocumentRoot.  You may comment
-# this out if you do not care for the documentation.
-#
-AliasMatch ^/manual(?:/(?:de|en|fr|ja|ko|ru))?(/.*)?$ "/var/www/manual$1"
-
-<Directory "/var/www/manual">
-    Options Indexes
-    AllowOverride None
-    Order allow,deny
-    Allow from all
-
-    <Files *.html>
-        SetHandler type-map
-    </Files>
-
-    SetEnvIf Request_URI ^/manual/de/ prefer-language=de
-    SetEnvIf Request_URI ^/manual/en/ prefer-language=en
-    SetEnvIf Request_URI ^/manual/fr/ prefer-language=fr
-    SetEnvIf Request_URI ^/manual/ja/ prefer-language=ja
-    SetEnvIf Request_URI ^/manual/ko/ prefer-language=ko
-    SetEnvIf Request_URI ^/manual/ru/ prefer-language=ru
-    RedirectMatch 301 ^/manual(?:/(de|en|fr|ja|ko|ru)){2,}(/.*)?$ /manual/$1$2
-</Directory>
-
+# WebDAV module configuration section.
+# 
 <IfModule mod_dav_fs.c>
     # Location of the WebDAV lock database.
     DAVLockDB /var/lib/dav/lockdb
 </IfModule>
 
-<IfModule mod_dav.c>
-    # XML request bodies are loaded into memory; limit to 128K by default
-    LimitXMLRequestBody 131072
-</IfModule>
-
 #
 # ScriptAlias: This controls which directories contain server scripts.
 # ScriptAliases are essentially the same as Aliases, except that