Commit 6e91ccb9 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r450070 from trunk: 

Memory leak fix: Unconditionally free the buffer.


Submitted by: minfrin
Reviewed by: jim


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

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                        -*- coding: utf-8 -*-

Changes with Apache 2.2.4









  *) mod_mem_cache: Memory leak fix: Unconditionally free the buffer.









     [Davi Arnaut <davi haxent.com.br>]

















  *) Allow mod_dumpio to log at other than DEBUG levels via









     the new DumpIOLogLevel directive. [Jim Jagielski]










































STATUS



+0
−5



























Changes for STATUS: 0 added lines, 5 removed lines.



Original line number
Diff line number
Diff line







@@ -78,11 +78,6 @@ RELEASE SHOWSTOPPERS:







PATCHES ACCEPTED TO BACKPORT FROM TRUNK:









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



















    * mod_mem_cache: Memory leak fix: Unconditionally free the buffer.









      Trunk: http://svn.apache.org/viewvc?view=rev&revision=450070









      +1: minfrin, jim, wrowe









        wrowe asks; should ptr mobj->m be nulled out for safety's sake?



















PATCHES PROPOSED TO BACKPORT FROM TRUNK:



















    * mpm_winnt: Fix return values from wait_for_many_objects.


































modules/cache/mod_mem_cache.c



+1
−1



























Changes for modules/cache/mod_mem_cache.c: 1 added line, 1 removed line.



Original line number
Diff line number
Diff line







@@ -206,7 +206,7 @@ static void cleanup_cache_object(cache_object_t *obj)

















    /* Cleanup the mem_cache_object_t */









    if (mobj) {









        if (mobj->type == CACHE_TYPE_HEAP && mobj->m) {









        if (mobj->m) {









            free(mobj->m);









        }









        if (mobj->type == CACHE_TYPE_FILE && mobj->fd) {