From: Jim Jagielski <jim@apache.org>
Date: Fri, 24 Mar 2017 13:44:50 +0000 (+0000)
Subject: Merge r1780095 from trunk:
X-Git-Tag: 2.4.26~229
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b90daf2b0ab9b5beb6d4ade175fd1fdc443221f2;p=apache

Merge r1780095 from trunk:

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 <hwibell gmail.com>]


Submitted by: covener
Reviewed by: covener, wrowe, ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1788448 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index ccab19ea51..6393a90784 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,11 @@
                                                          -*- coding: utf-8 -*-
 
 Changes with Apache 2.4.26
+  
+  *) 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 <hwibell gmail.com>]
 
   *) mod_proxy_fcgi: Add ProxyFCGISetEnvIf to fixup CGI environment
      variables just before invoking the FastCGI. [Eric Covener,
diff --git a/STATUS b/STATUS
index cf9b0206aa..73e5603ae4 100644
--- a/STATUS
+++ b/STATUS
@@ -124,13 +124,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) 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. 
-     trunk patch: http://svn.apache.org/r1780095
-     2.4.x patch: trunk works
-     +1: covener, wrowe, ylavic
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
diff --git a/server/util_expr_eval.c b/server/util_expr_eval.c
index 86d11c7e7a..6659ea62a2 100644
--- a/server/util_expr_eval.c
+++ b/server/util_expr_eval.c
@@ -1405,7 +1405,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;