Clean up mod_autoindex's storage of the IndexOptions settings.

	They are per-directory, not per-filename, so keeping them in
	an array is confusing and pointless.  They're now stored in an
	int in the module config record.  Also (finally!) fix the
	FancyIndexing directive so it gets merged into any IndexOptions
	settings for the current directory, rather than replacing them.

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

diff --git a/docs/manual/mod/mod_autoindex.html b/docs/manual/mod/mod_autoindex.html
index 2dc71e5411e6d00ed42a45afde5244bb0d8ef260..8f0bb3eecd4f016b37504cd5cf5e401ff5e9c1ce 100644 (file)
--- a/docs/manual/mod/mod_autoindex.html
+++ b/docs/manual/mod/mod_autoindex.html
@@ -373,10 +373,14 @@ The FancyIndexing directive sets the FancyIndexing option for a directory.
 preference.
 </P>
 <BLOCKQUOTE>
- <STRONG>Note that the <SAMP>FancyIndexing</SAMP> and
+ <STRONG>Note that in versions of Apache prior to 1.3.2, the
+ <SAMP>FancyIndexing</SAMP> and
  <SAMP>IndexOptions</SAMP> directives will override each other. You
  should use <SAMP>IndexOptions&nbsp;FancyIndexing</SAMP> in preference
- to the standalone <SAMP>FancyIndexing</SAMP> directive.</STRONG>
+ to the standalone <SAMP>FancyIndexing</SAMP> directive.
+ As of Apache 1.3.2, a standalone <SAMP>FancyIndexing</SAMP> directive
+ is combined with any <SAMP>IndexOptions</SAMP> directive already
+ specified for the current scope.</STRONG>
 </BLOCKQUOTE>
 <HR>