Commit da578d08 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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
parent 5f90ca77

STATUS

+0 −6
Changes for STATUS: 0 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -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:

modules/mappers/mod_dir.c

+2 −9
Changes for modules/mappers/mod_dir.c: 2 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -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 */