Commit bbccb628 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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
parent a7d32da2

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -2,6 +2,11 @@ 


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,

     Jacob Champion]

STATUS

+0 −7
Original line number Diff line number Diff line
@@ -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:

server/util_expr_eval.c

+4 −1
Original line number Diff line number Diff line
@@ -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;