From: Eric Covener <covener@apache.org>
Date: Fri, 15 May 2015 18:44:49 +0000 (+0000)
Subject: revert r1675103 because it [at least] causes FallBackResource to kick
X-Git-Tag: 2.5.0-alpha~3149
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca457364c85fbe183163340cc03764e1379841fc;p=thirdparty%2Fapache%2Fhttpd.git

revert r1675103 because it [at least] causes FallBackResource to kick
in before mod_autoindex might have kicked in.



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

diff --git a/modules/mappers/mod_dir.c b/modules/mappers/mod_dir.c
index 93533850c2a..d2d075d98b3 100644
--- a/modules/mappers/mod_dir.c
+++ b/modules/mappers/mod_dir.c
@@ -387,15 +387,8 @@ static int fixup_dir(request_rec *r)
 static int dir_fixups(request_rec *r)
 {
     if (r->finfo.filetype == APR_DIR) {
-        if (fixup_dir(r) == OK) {
-            return OK;
-        }
-        /* we're running between mod_rewrites fixup and its internal redirect handler, step aside */
-        if (!strcmp(r->handler, REWRITE_REDIRECT_HANDLER_NAME)) {
-            return DECLINED;
-        }
-
-        return fixup_dflt(r);
+        /* serve up a directory */
+        return fixup_dir(r);
     }
     else if ((r->finfo.filetype == APR_NOFILE) && (r->handler == NULL)) {
         /* No handler and nothing in the filesystem - use fallback */