summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorWilliam A. Rowe Jr <wrowe@apache.org>2001-08-20 16:14:22 +0200
committerWilliam A. Rowe Jr <wrowe@apache.org>2001-08-20 16:14:22 +0200
commit4bf48e8e094727be354306f971c5b7fc933d9a1f (patch)
tree5fff044865f8924efdce8db79c45c37756d76772 /docs
parentExtend 'openssl' search to the directories from PATH (diff)
downloadapache2-4bf48e8e094727be354306f971c5b7fc933d9a1f.tar.xz
apache2-4bf48e8e094727be354306f971c5b7fc933d9a1f.zip
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
Diffstat (limited to 'docs')
-rw-r--r--docs/conf/httpd-std.conf4
-rw-r--r--docs/conf/httpd-win.conf4
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/conf/httpd-std.conf b/docs/conf/httpd-std.conf
index ccc7132990..7c12139afd 100644
--- 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 8b0092eaab..8265407438 100644
--- 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>