You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2006/12/13 15:10:43 UTC
svn commit: r486661 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
modules/cache/mod_mem_cache.c
Author: jim
Date: Wed Dec 13 06:10:41 2006
New Revision: 486661
URL: http://svn.apache.org/viewvc?view=rev&rev=486661
Log:
Merge r450070 from trunk:
Memory leak fix: Unconditionally free the buffer.
Submitted by: minfrin
Reviewed by: jim
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/cache/mod_mem_cache.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?view=diff&rev=486661&r1=486660&r2=486661
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Wed Dec 13 06:10:41 2006
@@ -1,6 +1,9 @@
-*- 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]
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?view=diff&rev=486661&r1=486660&r2=486661
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Wed Dec 13 06:10:41 2006
@@ -78,11 +78,6 @@
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.
Modified: httpd/httpd/branches/2.2.x/modules/cache/mod_mem_cache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/cache/mod_mem_cache.c?view=diff&rev=486661&r1=486660&r2=486661
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/cache/mod_mem_cache.c (original)
+++ httpd/httpd/branches/2.2.x/modules/cache/mod_mem_cache.c Wed Dec 13 06:10:41 2006
@@ -206,7 +206,7 @@
/* 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) {