From: Jim Jagielski <jim@apache.org>
Date: Wed, 16 Sep 2015 13:33:12 +0000 (+0000)
Subject: Merge r1701436 from trunk:
X-Git-Tag: 2.4.17~128
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=666ec5901df70e69f9fd2e410cb419cb0f5270cc;p=apache

Merge r1701436 from trunk:

allow autoindex w/o mod_dir/mod_mime setting the DIR_MAGIC_TYPE.


Submitted by: covener
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1703404 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index b669af72b4..89fade278e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.17
 
+  *) mod_autoindex: Allow autoindexes when neither mod_dir nor mod_mime are
+     loaded. [Eric Covener]
+
   *) mod_rewrite:  Allow cookies set by mod_rewrite to contain ':' by accepting
      ';' as an alternate separator.  PR47241. 
      [<bugzilla schermesser com>, Eric Covener]
diff --git a/STATUS b/STATUS
index 587e399bbb..5a0224377c 100644
--- a/STATUS
+++ b/STATUS
@@ -109,11 +109,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_autoindex: Allow autoindexes to work without mod_dir or mod_mime
-     trunk: http://svn.apache.org/r1701436
-     2.4.x: trunk works
-     +1: covener, ylavic, jim
-
   *) Easy patches - synch with trunk
         - core: Core filters do not need mod_proxy.h
         - core: Small speed optimization when parsing <Limit>, <LimitExcept>
diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
index 043a7af736..8f8cc8e2e6 100644
--- a/modules/generators/mod_autoindex.c
+++ b/modules/generators/mod_autoindex.c
@@ -2274,7 +2274,10 @@ static int handle_autoindex(request_rec *r)
     autoindex_config_rec *d;
     int allow_opts;
 
-    if(strcmp(r->handler,DIR_MAGIC_TYPE)) {
+    if (strcmp(r->handler,DIR_MAGIC_TYPE) && !AP_IS_DEFAULT_HANDLER_NAME(r->handler)) {
+        return DECLINED;
+    }
+    if (r->finfo.filetype != APR_DIR) {
         return DECLINED;
     }