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

Merge r1830746 from trunk: 

mod_proxy_html: Fix variable interpolation and memory allocation failure in ProxyHTMLURLMap.

Proposed by: Ewald Dieterich <ewald mailbox.org>
Reviewed by: ylavic


Submitted by: ylavic
Reviewed by: ylavic, jailletc36, jim


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

CHANGES

+3 −0
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.4.34



  *) mod_proxy_html: Fix variable interpolation and memory allocation failure

     in ProxyHTMLURLMap.  [Ewald Dieterich <ewald mailbox.org>]



  *) mod_remoteip: Fix RemoteIP{Trusted,Internal}ProxyList loading broken by 2.4.30.

     PR 62220.  [Chritophe Jaillet, Yann Ylavic]

STATUS

+0 −7
Original line number Diff line number Diff line
@@ -141,13 +141,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) mod_proxy_html: Fix variable interpolation and memory allocation failure

     in ProxyHTMLURLMap. PR 62344.

     trunk patch: http://svn.apache.org/r1830746

     2.4.x patch: svn merge -c 1830746 ^/httpd/httpd/trunk .

                  (trunk works modulo CHANGES))

     +1: ylavic, jailletc36, jim



  *) http: Fix small memory leak per request when handling persistent connections

     trunk patch: http://svn.apache.org/r1833014

     2.4.x patch: trunk works (modulo CHANGES)

modules/filters/mod_proxy_html.c

+6 −0
Original line number Diff line number Diff line
@@ -724,6 +724,12 @@ static const char *interpolate_vars(request_rec *r, const char *str) 
            break;



        delim = ap_strchr_c(start, '|');



        /* Restrict delim to ${...} */

        if (delim && delim >= end) {

            delim = NULL;

        }



        before = apr_pstrndup(r->pool, str, start-str);

        after = end+1;

        if (delim) {