You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2015/05/15 20:44:49 UTC

svn commit: r1679620 - /httpd/httpd/trunk/modules/mappers/mod_dir.c

Author: covener
Date: Fri May 15 18:44:49 2015
New Revision: 1679620

URL: http://svn.apache.org/r1679620
Log:
revert r1675103 because it [at least] causes FallBackResource to kick
in before mod_autoindex might have kicked in.


Modified:
    httpd/httpd/trunk/modules/mappers/mod_dir.c

Modified: httpd/httpd/trunk/modules/mappers/mod_dir.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_dir.c?rev=1679620&r1=1679619&r2=1679620&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_dir.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_dir.c Fri May 15 18:44:49 2015
@@ -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 */