Merge r1679620 from trunk:

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

Submitted by: covener
Reviewed/backported by: jim

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

diff --git a/STATUS b/STATUS
index ebbad96adafd400d8834d081360f242f0edd86e0..af8589aba4998b0473ead44646c7b30095ff3476 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -105,12 +105,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_dir: backport r1679620 which reverts r1675103. This change makes 
-     FallBackResource hijack requests that mod_autoindex might want to handle
-     later.
-     trunk patch: http://svn.apache.org/r1679620
-     2.4.x patch: trunk works
-     +1 covener, gsmith, jim
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:

diff --git a/modules/mappers/mod_dir.c b/modules/mappers/mod_dir.c
index 0e8ab55f016d24ef9b10ff569274860b67331b8f..542236b54f42c248f33baaf808e2cb700b545a53 100644 (file)
--- a/modules/mappers/mod_dir.c
+++ b/modules/mappers/mod_dir.c
@@ -383,15 +383,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 */