cvs: ZendEngine2 / zend_alloc.c

andi            Wed May 26 16:55:17 2004 EDT

  Modified files:              
    /ZendEngine2        zend_alloc.c 
  Log:
  - Fix memory manager problem
  
  
http://cvs.php.net/diff.php/ZendEngine2/zend_alloc.c?r1=1.134&r2=1.135&ty=u
Index: ZendEngine2/zend_alloc.c
diff -u ZendEngine2/zend_alloc.c:1.134 ZendEngine2/zend_alloc.c:1.135
--- ZendEngine2/zend_alloc.c:1.134      Tue May 25 06:09:46 2004
+++ ZendEngine2/zend_alloc.c    Wed May 26 16:55:16 2004
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_alloc.c,v 1.134 2004/05/25 10:09:46 andi Exp $ */
+/* $Id: zend_alloc.c,v 1.135 2004/05/26 20:55:16 andi Exp $ */
 
 #include "zend.h"
 #include "zend_alloc.h"
@@ -496,11 +496,10 @@
 #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));
@@ -622,11 +621,10 @@
 #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));


-- 
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php