allow proxying and rules in .htaccess in subrequests

PR: 14648, 15114

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102327 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 90b3d33c71fde9a7cca90743d0f3695fad781ebb..2c16539556505e35e4f0a5eea3675d693558ce3c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) mod_rewrite: Allow proxying and RewriteRules in directory context
+     for subrequests.  PR 14648, 15114.  [André Malo]
+
   *) mod_rewrite: Allow setting of any valid HTTP response code.
      PR 25917.  [André Malo]
 

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index f4dc514c3176205d47101dfb5b3d073ffc0ddd00..e1cd993773f3a034c00d80754101805c9ba9ffd0 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -3754,7 +3754,6 @@ static int apply_rewrite_list(request_rec *r, apr_array_header_t *rewriterules,
          */
         if (r->main != NULL &&
             (p->flags & RULEFLAG_IGNOREONSUBREQ ||
-             p->flags & RULEFLAG_PROXY          ||
              p->flags & RULEFLAG_FORCEREDIRECT    )) {
             continue;
         }
@@ -4273,11 +4272,6 @@ static int hook_fixup(request_rec *r)
         return DECLINED;
     }
 
-    /* we shouldn't do anything in subrequests */
-    if (r->main != NULL) {
-        return DECLINED;
-    }
-
     /* if there are no real (i.e. no RewriteRule directives!)
        per-dir config of us, we return also immediately */
     if (dconf->directory == NULL) {