From: Colm MacCarthaigh <colm@apache.org>
Date: Mon, 24 Oct 2005 01:14:49 +0000 (+0000)
Subject: Merge r233369 from trunk:
X-Git-Tag: 2.1.9~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea2977466f212c7e8e3441a3ac7304c2b34a95c8;p=thirdparty%2Fapache%2Fhttpd.git

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 c2dd0fb058b..eca688fe277 100644
--- 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;