summaryrefslogtreecommitdiffstats
path: root/modules/filters
diff options
context:
space:
mode:
authorNick Kew <niq@apache.org>2008-12-31 03:27:24 +0100
committerNick Kew <niq@apache.org>2008-12-31 03:27:24 +0100
commit15ad1d5eb2fb1b4fe89cc61e19f7618424394bf9 (patch)
tree64cb706e26dee731c37d2e7a055c5e2bd61a027f /modules/filters
parentPR#13603 - clarify description of DOCUMENT_URI (diff)
downloadapache2-15ad1d5eb2fb1b4fe89cc61e19f7618424394bf9.tar.xz
apache2-15ad1d5eb2fb1b4fe89cc61e19f7618424394bf9.zip
Add support for escaping all non-ascii chars to ap_escape_html, and use
it to fix PR#25202: encoding="entity" doesn't work as advertised in mod_include. For backport, this'll need an ABI-preserving version that'll be a minor MMN bump. But if we do that in /trunk/, it'll never change. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@730296 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/filters')
-rw-r--r--modules/filters/mod_include.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index bf7aa76f62..302155e23b 100644
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -1192,7 +1192,8 @@ static apr_status_t handle_echo(include_ctx_t *ctx, ap_filter_t *f,
echo_text = ap_escape_uri(ctx->dpool, val);
break;
case E_ENTITY:
- echo_text = ap_escape_html(ctx->dpool, val);
+ /* PR#25202: escape anything non-ascii here */
+ echo_text = ap_escape_html2(ctx->dpool, val, 1);
break;
}