This patch;

    enables Multiviews only for htdocs/manual/

    enables .var type map files to shortcut Multiviews

    changes the DirectoryIndex to index.html.var before index.html,
    again to avoid multiviews if a typemap exists.

    locates the /manual resource by an alias, so the user may easily
    change their DocumentRoot and still have access to the documentation.

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

diff --git a/docs/conf/httpd-std.conf b/docs/conf/httpd-std.conf
index 9fd44d952f77e0d4933a5a5eaaa808cb56ef4253..ccc7132990c572be8608d95ff6c143a21850df68 100644 (file)
--- a/docs/conf/httpd-std.conf
+++ b/docs/conf/httpd-std.conf
@@ -294,7 +294,7 @@ DocumentRoot "@@ServerRoot@@/htdocs"
 # Note that "MultiViews" must be named *explicitly* --- "Options All"
 # doesn't give it to you.
 #
-    Options Indexes FollowSymLinks MultiViews
+    Options Indexes FollowSymLinks
 
 #
 # This controls which options the .htaccess files in directories can
@@ -308,6 +308,15 @@ DocumentRoot "@@ServerRoot@@/htdocs"
 #
     Order allow,deny
     Allow from all
+
+#
+# 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.
+#
+    DirectoryIndex index.html.var index.html
+
 </Directory>
 
 #
@@ -466,6 +475,9 @@ ServerSignature On
 # realname must also be slash terminated, and if the fakename omits the 
 # trailing slash, the realname must also omit it.
 #
+# We include the /icons/ alias for FancyIndexed directory listings.  If you
+# do not use FancyIndexing, you may comment this out.
+#
 Alias /icons/ "@@ServerRoot@@/icons/"
 
 <Directory "@@ServerRoot@@/icons">
@@ -475,6 +487,25 @@ Alias /icons/ "@@ServerRoot@@/icons/"
     Allow from all
 </Directory>
 
+#
+# This should be changed to the ServerRoot/htdocs/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.
+#
+Alias /manual "@@ServerRoot@@/htdocs/manual"
+
+<Directory "@@ServerRoot@@/htdocs/manual/">
+    Options Indexes FollowSymLinks MultiViews
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+#
+# Because we do not distribute type map files for htdocs/manual/,
+# we can save one stat call by not looking for one.
+#
+    DirectoryIndex index.html
+</Directory>
+
 #
 # ScriptAlias: This controls which directories contain server scripts.
 # ScriptAliases are essentially the same as Aliases, except that