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

Merge r757741 from trunk: 

* Fix a memory leak by freeing the memory consumed by the bucket.

PR: 44948
Submitted by: Dan Poirier <poirier pobox.com>
Reviewed by: rpluem

Submitted by: rpluem
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@766002 13f79535-47bb-0310-9956-ffa450edef68
parent 5cfcf8c9

CHANGES

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

Changes with Apache 2.2.12



  *) mod_substitute: Fix a memory leak. PR 44948

     [Dan Poirier <poirier pobox.com>]



  *) mod_proxy_ajp: Forward remote port information by default.

     [Rainer Jung]

STATUS

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

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



 * mod_substitute: Fix a memory leak.

   Trunk version of patch:

      http://svn.apache.org/viewvc?rev=757741&view=rev

   Backport version for 2.2.x of patch:

      Trunk version of patch works

   +1: rpluem, gregames, jim







PATCHES PROPOSED TO BACKPORT FROM TRUNK:

modules/filters/mod_substitute.c

+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ static apr_status_t substitute_filter(ap_filter_t *f, apr_bucket_brigade *bb) 
             */

            rv = apr_bucket_read(b, &buff, &bytes, APR_BLOCK_READ);

            if (rv != APR_SUCCESS || bytes == 0) {

                APR_BUCKET_REMOVE(b);

                apr_bucket_delete(b);

            }

            else {

                int num = 0;