From fe3c9b7a0f2261688946b4b36915e8f8fe9b7428 Mon Sep 17 00:00:00 2001 From: Eric Covener Date: Tue, 24 Jan 2017 17:09:47 +0000 Subject: [PATCH] Fix %{DOCUMENT_URI} in SSI w/ default parser *) core: %{DOCUMENT_URI} used in nested SSI expressions should point to the URI originally requsted by the user, not the nested documents URI. This restores the behavior of this variable to match the "legacy" SSI parser. PR60624. Submitted By [Hank Ibell ] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780095 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 5 +++++ server/util_expr_eval.c | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index f192b9cb28d..f462268c13a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,11 @@ -*- coding: utf-8 -*- Changes with Apache 2.5.0 + *) core: %{DOCUMENT_URI} used in nested SSI expressions should point to the + URI originally requsted by the user, not the nested documents URI. This + restores the behavior of this variable to match the "legacy" SSI parser. + PR60624. [Hank Ibell ] + *) mod_proxy_hcheck: Don't validate timed out responses. [Yann Ylavic] *) mod_proxy_hcheck: Ensure thread-safety when concurrent healthchecks are diff --git a/server/util_expr_eval.c b/server/util_expr_eval.c index e08c4d2ac19..9f3640481da 100644 --- a/server/util_expr_eval.c +++ b/server/util_expr_eval.c @@ -1525,7 +1525,10 @@ static const char *request_var_fn(ap_expr_eval_ctx_t *ctx, const void *data) return result; } case 23: - return r->uri; + { + const char *uri = apr_table_get(r->subprocess_env, "DOCUMENT_URI"); + return uri ? uri : r->uri; + } case 24: { apr_time_exp_t tm; -- 2.47.2