summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorAndré Malo <nd@apache.org>2004-01-13 22:44:49 +0100
committerAndré Malo <nd@apache.org>2004-01-13 22:44:49 +0100
commita68ada0ee951358a3bda90239733b7251ea99eb4 (patch)
treef0ad4e65e81ce210b6c55ea8ba2925053a9c20e9 /modules
parentwith the new general status stuff, F and G are just shortcuts (diff)
downloadapache2-a68ada0ee951358a3bda90239733b7251ea99eb4.tar.xz
apache2-a68ada0ee951358a3bda90239733b7251ea99eb4.zip
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
Diffstat (limited to 'modules')
-rw-r--r--modules/mappers/mod_rewrite.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index f4dc514c31..e1cd993773 100644
--- 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) {