Commit 79e35ebc authored by Eric Covener's avatar Eric Covener
Browse files

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>]



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1780095 13f79535-47bb-0310-9956-ffa450edef68
parent 1712cbfd

CHANGES

+5 −0
Original line number Diff line number Diff line 
                                                         -*- 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 <hwibell gmail.com>]



  *) mod_proxy_hcheck: Don't validate timed out responses.  [Yann Ylavic]



  *) mod_proxy_hcheck: Ensure thread-safety when concurrent healthchecks are

server/util_expr_eval.c

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