cvs: ZendEngine2 / zend_alloc.c

andi Fri Jul 2 20:16:39 2004 EDT Modified files: /ZendEngine2 zend_alloc.c Log: - Should fix mem leak with ZEND_MM. I made this change a while ago and - rolled it back but I don't remember why. Please test! http://cvs.php.net/diff.php/ZendEngine2/zend_alloc.c?r1=1.135&r2=1.136&ty=u Index: ZendEngine2/zend_alloc.c diff -u ZendEngine2/zend_alloc.c:1.135 ZendEngine2/zend_alloc.c:1.136 --- ZendEngine2/zend_alloc.c:1.135 Wed May 26 16:55:16 2004 +++ ZendEngine2/zend_alloc.c Fri Jul 2 20:16:39 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_alloc.c,v 1.135 2004/05/26 20:55:16 andi Exp $ */ +/* $Id: zend_alloc.c,v 1.136 2004/07/03 00:16:39 andi Exp $ */ #include "zend.h" #include "zend_alloc.h" @@ -496,10 +496,12 @@ #endif /* !ZEND_DISABLE_MEMORY_CACHE */ #if defined(ZEND_MM) && !ZEND_DEBUG + zend_mm_shutdown(&AG(mm_heap)); if (full_shutdown) { - zend_mm_shutdown(&AG(mm_heap)); return; } + zend_mm_startup(&AG(mm_heap), 256*1024); + #elif defined(ZEND_WIN32) && !ZEND_DEBUG if (full_shutdown && AG(memory_heap)) { HeapDestroy(AG(memory_heap)); @@ -621,10 +623,11 @@ #endif #if defined(ZEND_MM) && ZEND_DEBUG + zend_mm_shutdown(&AG(mm_heap)); if (full_shutdown) { - zend_mm_shutdown(&AG(mm_heap)); return; } + zend_mm_startup(&AG(mm_heap), 256*1024); #elif defined(ZEND_WIN32) && ZEND_DEBUG if (full_shutdown && AG(memory_heap)) { HeapDestroy(AG(memory_heap));