From ea509dba284b42b56d9a434074a53ca6876f79b5 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Mon, 18 May 2015 11:07:54 +0000 Subject: [PATCH] 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 --- STATUS | 6 ------ modules/mappers/mod_dir.c | 11 ++--------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/STATUS b/STATUS index ebbad96ada..af8589aba4 100644 --- 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 0e8ab55f01..542236b54f 100644 --- 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 */ -- 2.40.0