From: André Malo <nd@apache.org>
Date: Fri, 2 Jan 2004 23:45:06 +0000 (+0000)
Subject: fix a rewrite mistake: restore the ability to expand variables within
X-Git-Tag: pre_ajp_proxy~892
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=657f5d5ba3997b17dcc192783eda9745d012a39c;p=apache

fix a rewrite mistake: restore the ability to expand variables within
<!--include file...-->.


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

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 8ae98943ef..62d92baa45 100644
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -1704,7 +1704,7 @@ static apr_status_t handle_include(include_ctx_t *ctx, ap_filter_t *f,
             apr_status_t rv;
 
             /* be safe; only files in this directory or below allowed */
-            rv = apr_filepath_merge(&newpath, NULL, tag_val,
+            rv = apr_filepath_merge(&newpath, NULL, parsed_string,
                                     APR_FILEPATH_NOTABOVEROOT |
                                     APR_FILEPATH_SECUREROOTTEST |
                                     APR_FILEPATH_NOTABSOLUTE, ctx->dpool);