simplify type-map config

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

diff --git a/docs/conf/httpd-std.conf.in b/docs/conf/httpd-std.conf.in
index ba7540acb723bbc59b217f38fc3590e262f0ae81..76895789199f5349f276a44c1ed0bc76090e1949 100644 (file)
--- a/docs/conf/httpd-std.conf.in
+++ b/docs/conf/httpd-std.conf.in
@@ -579,9 +579,8 @@ ServerSignature On
         Order allow,deny
         Allow from all
 
-        AddHandler type-map .html
-        <Files *.html.*>
-            RemoveHandler .html
+        <Files *.html>
+            SetHandler type-map
         </Files>
 
         SetEnvIf Request_URI ^/manual/(de|en|fr|ja|ko|ru)/ prefer-language=$1

diff --git a/docs/conf/httpd-win.conf b/docs/conf/httpd-win.conf
index 117aa93732e7c683c83c81e96122d417833d4f03..ff4d222ef7aec33b95ee0ef01e8f829830782674 100644 (file)
--- a/docs/conf/httpd-win.conf
+++ b/docs/conf/httpd-win.conf
@@ -502,9 +502,8 @@ AliasMatch ^/manual(?:/(?:de|en|fr|ja|ko|ru))?(/.*)?$ "@@ServerRoot@@/manual$1"
     Order allow,deny
     Allow from all
 
-    AddHandler type-map .html
-    <Files *.html.*>
-        RemoveHandler .html
+    <Files *.html>
+        SetHandler type-map
     </Files>
 
     SetEnvIf Request_URI ^/manual/(de|en|fr|ja|ko|ru)/ prefer-language=$1