From: Andi Gutmans <andi@php.net>
Date: Wed, 26 May 2004 20:55:16 +0000 (+0000)
Subject: - Fix memory manager problem
X-Git-Tag: php-5.0.0RC3RC1~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=97dee3a8c213e36238b1dbde9e606ab134a784e8;p=php

- Fix memory manager problem
---

diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index ac39502ec0..9b7585693e 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -496,11 +496,10 @@ ZEND_API void shutdown_memory_manager(int silent, int full_shutdown TSRMLS_DC)
 #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 @@ ZEND_API void shutdown_memory_manager(int silent, int full_shutdown TSRMLS_DC)
 #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));