Per Martin, Mark's and my discussion, index.html will _still_ override

  the typemap, and enabling multiviews will undo the optimization.

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

diff --git a/docs/conf/httpd-std.conf b/docs/conf/httpd-std.conf
index ccc7132990c572be8608d95ff6c143a21850df68..7c12139afdd3fcb0d6e8718ed35ef30b02fcb45d 100644 (file)
--- a/docs/conf/httpd-std.conf
+++ b/docs/conf/httpd-std.conf
@@ -313,9 +313,9 @@ DocumentRoot "@@ServerRoot@@/htdocs"
 # Note that directly accessing an index.html.var typemap is much faster
 # than using MultiViews negotation on a directory.  We distribute a typemap
 # of the complete index.html collection, so we use that index.html.var
-# typemap here.
+# typemap here.  If Options is set to Multiviews, this optimization is lost.
 #
-    DirectoryIndex index.html.var index.html
+    DirectoryIndex index.html index.html.var
 
 </Directory>
 

diff --git a/docs/conf/httpd-win.conf b/docs/conf/httpd-win.conf
index 8b0092eaab8753e0b396554611483a9383821ab8..82654074384d89f19e10e025b6b3d6a7f1e37038 100644 (file)
--- a/docs/conf/httpd-win.conf
+++ b/docs/conf/httpd-win.conf
@@ -235,9 +235,9 @@ DocumentRoot "@@ServerRoot@@/htdocs"
 # Note that directly accessing an index.html.var typemap is much faster
 # than using MultiViews negotation on a directory.  We distribute a typemap
 # of the complete index.html collection, so we use that index.html.var
-# typemap here.
+# typemap here.  If Options is set to Multiviews, this optimization is lost.
 #
-    DirectoryIndex index.html.var index.html
+    DirectoryIndex index.html index.html.var
 
 </Directory>