| 1 |
commit: afe4150b04846f8da24e47df51a714c0a91b73cc |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 22 08:28:44 2014 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 22 08:28:44 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/apache.git;a=commit;h=afe4150b |
| 7 |
|
| 8 |
Wrap some IfDefine around 00_mod_autoindex.conf so people can disable it (bug #493020). |
| 9 |
|
| 10 |
--- |
| 11 |
2.2/conf/modules.d/00_mod_autoindex.conf | 3 +++ |
| 12 |
2.4/conf/modules.d/00_mod_autoindex.conf | 3 +++ |
| 13 |
2 files changed, 6 insertions(+) |
| 14 |
|
| 15 |
diff --git a/2.2/conf/modules.d/00_mod_autoindex.conf b/2.2/conf/modules.d/00_mod_autoindex.conf |
| 16 |
index ca2a168..097410a 100644 |
| 17 |
--- a/2.2/conf/modules.d/00_mod_autoindex.conf |
| 18 |
+++ b/2.2/conf/modules.d/00_mod_autoindex.conf |
| 19 |
@@ -1,4 +1,6 @@ |
| 20 |
<IfModule autoindex_module> |
| 21 |
+<IfDefine !NO_AUTOINDEX_CONF> |
| 22 |
+ |
| 23 |
<IfModule alias_module> |
| 24 |
# We include the /icons/ alias for FancyIndexed directory listings. If |
| 25 |
# you do not use FancyIndexing, you may comment this out. |
| 26 |
@@ -78,6 +80,7 @@ HeaderName HEADER.html |
| 27 |
# IndexIgnore is a set of filenames which directory indexing should ignore |
| 28 |
# and not include in the listing. Shell-style wildcarding is permitted. |
| 29 |
IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t |
| 30 |
+</IfDefine> |
| 31 |
</IfModule> |
| 32 |
|
| 33 |
# vim: ts=4 filetype=apache |
| 34 |
|
| 35 |
diff --git a/2.4/conf/modules.d/00_mod_autoindex.conf b/2.4/conf/modules.d/00_mod_autoindex.conf |
| 36 |
index f3acf0f..10bf483 100644 |
| 37 |
--- a/2.4/conf/modules.d/00_mod_autoindex.conf |
| 38 |
+++ b/2.4/conf/modules.d/00_mod_autoindex.conf |
| 39 |
@@ -1,4 +1,6 @@ |
| 40 |
<IfModule autoindex_module> |
| 41 |
+<IfDefine !NO_AUTOINDEX_CONF> |
| 42 |
+ |
| 43 |
<IfModule alias_module> |
| 44 |
# We include the /icons/ alias for FancyIndexed directory listings. If |
| 45 |
# you do not use FancyIndexing, you may comment this out. |
| 46 |
@@ -77,6 +79,7 @@ HeaderName HEADER.html |
| 47 |
# IndexIgnore is a set of filenames which directory indexing should ignore |
| 48 |
# and not include in the listing. Shell-style wildcarding is permitted. |
| 49 |
IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t |
| 50 |
+</IfDefine> |
| 51 |
</IfModule> |
| 52 |
|
| 53 |
# vim: ts=4 filetype=apache |
Archives