Merge r233369 from trunk:

Do not check the value of r->handler.

This allows the use of SetHandler for an entire directory, and since we already check via the stat structure if this is a directory, there is no reason for this extra check, which causes a regression since 1.3.

PR: 25435

Submitted by: pquerna
Reviewed by: colm

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

diff --git a/modules/mappers/mod_dir.c b/modules/mappers/mod_dir.c
index c2dd0fb058bfd044dbc3e53f898db6251591033b..eca688fe2773dd8fe086826b9e8e28447fe08a7c 100644 (file)
--- a/modules/mappers/mod_dir.c
+++ b/modules/mappers/mod_dir.c
@@ -151,10 +151,6 @@ static int fixup_dir(request_rec *r)
         return HTTP_MOVED_PERMANENTLY;
     }
 
-    if (strcmp(r->handler, DIR_MAGIC_TYPE)) {
-        return DECLINED;
-    }
-
     if (d->index_names) {
         names_ptr = (char **)d->index_names->elts;
         num_names = d->index_names->nelts;