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 ccab19ea512e29899945604a55bcaf3631c8a771..6393a9078468e109176542b8b70c8dd91829985e 100644 (file)
--- 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 cf9b0206aa48057bcb23a053af340055eeff8697..73e5603ae457e5dbfd9e04d7614f7314c4c3f09a 100644 (file)
--- 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 86d11c7e7a75898b3b3019f41445cf3a739ba359..6659ea62a26b6e1ec8c820e2fa2758b00ba628ca 100644 (file)
--- 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;