commit: afe4150b04846f8da24e47df51a714c0a91b73cc Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Thu May 22 08:28:44 2014 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Thu May 22 08:28:44 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/apache.git;a=commit;h=afe4150b
Wrap some IfDefine around 00_mod_autoindex.conf so people can disable it (bug #493020). --- 2.2/conf/modules.d/00_mod_autoindex.conf | 3 +++ 2.4/conf/modules.d/00_mod_autoindex.conf | 3 +++ 2 files changed, 6 insertions(+) diff --git a/2.2/conf/modules.d/00_mod_autoindex.conf b/2.2/conf/modules.d/00_mod_autoindex.conf index ca2a168..097410a 100644 --- a/2.2/conf/modules.d/00_mod_autoindex.conf +++ b/2.2/conf/modules.d/00_mod_autoindex.conf @@ -1,4 +1,6 @@ <IfModule autoindex_module> +<IfDefine !NO_AUTOINDEX_CONF> + <IfModule alias_module> # We include the /icons/ alias for FancyIndexed directory listings. If # you do not use FancyIndexing, you may comment this out. @@ -78,6 +80,7 @@ HeaderName HEADER.html # IndexIgnore is a set of filenames which directory indexing should ignore # and not include in the listing. Shell-style wildcarding is permitted. IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t +</IfDefine> </IfModule> # vim: ts=4 filetype=apache diff --git a/2.4/conf/modules.d/00_mod_autoindex.conf b/2.4/conf/modules.d/00_mod_autoindex.conf index f3acf0f..10bf483 100644 --- a/2.4/conf/modules.d/00_mod_autoindex.conf +++ b/2.4/conf/modules.d/00_mod_autoindex.conf @@ -1,4 +1,6 @@ <IfModule autoindex_module> +<IfDefine !NO_AUTOINDEX_CONF> + <IfModule alias_module> # We include the /icons/ alias for FancyIndexed directory listings. If # you do not use FancyIndexing, you may comment this out. @@ -77,6 +79,7 @@ HeaderName HEADER.html # IndexIgnore is a set of filenames which directory indexing should ignore # and not include in the listing. Shell-style wildcarding is permitted. IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t +</IfDefine> </IfModule> # vim: ts=4 filetype=apache
