adjust config to work with typemaps.

argh. Forget to mention all the time (sorry): The typmap stuff was
Reviewed by: Erik Abele, Astrid Ke�ler

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100197 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/conf/httpd-std.conf.in b/docs/conf/httpd-std.conf.in
index 93482fad50310c17bda5e2dbd32e03d65eccdd40..ba7540acb723bbc59b217f38fc3590e262f0ae81 100644 (file)
--- a/docs/conf/httpd-std.conf.in
+++ b/docs/conf/httpd-std.conf.in
@@ -574,11 +574,16 @@ ServerSignature On
     AliasMatch ^/manual(?:/(?:de|en|fr|ja|ko|ru))?(/.*)?$ "@exp_manualdir@$1"
 
     <Directory "@exp_manualdir@">
-        Options Indexes FollowSymLinks MultiViews
+        Options Indexes
         AllowOverride None
         Order allow,deny
         Allow from all
 
+        AddHandler type-map .html
+        <Files *.html.*>
+            RemoveHandler .html
+        </Files>
+
         SetEnvIf Request_URI ^/manual/(de|en|fr|ja|ko|ru)/ prefer-language=$1
         RedirectMatch 301 ^/manual(?:/(de|en|fr|ja|ko|ru)){2,}(/.*)?$ /manual/$1$2
     </Directory>

diff --git a/docs/conf/httpd-win.conf b/docs/conf/httpd-win.conf
index cc83ccab3d2990a3cf12c6df53e41475c99a8d65..117aa93732e7c683c83c81e96122d417833d4f03 100644 (file)
--- a/docs/conf/httpd-win.conf
+++ b/docs/conf/httpd-win.conf
@@ -497,11 +497,16 @@ Alias /icons/ "@@ServerRoot@@/icons/"
 AliasMatch ^/manual(?:/(?:de|en|fr|ja|ko|ru))?(/.*)?$ "@@ServerRoot@@/manual$1"
 
 <Directory "@@ServerRoot@@/manual">
-    Options Indexes FollowSymLinks MultiViews
+    Options Indexes
     AllowOverride None
     Order allow,deny
     Allow from all
 
+    AddHandler type-map .html
+    <Files *.html.*>
+        RemoveHandler .html
+    </Files>
+
     SetEnvIf Request_URI ^/manual/(de|en|fr|ja|ko|ru)/ prefer-language=$1
     RedirectMatch 301 ^/manual(?:/(de|en|fr|ja|ko|ru)){2,}(/.*)?$ /manual/$1$2
 </Directory>