com php-src: Revert "Fixed memleak in alloc_globals_ctor" : Zend/zend_alloc.c
| From: | Xinchen Hui | Date: | Sun, 08 Mar 2015 16:17:52 +0000 |
| Subject: | com php-src: Revert "Fixed memleak in alloc_globals_ctor" : Zend/zend_alloc.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85328@lists.php.net to get a copy of this message | ||
Commit: 51b96086d7e7f160256f8f1dd76df19ba0ddd091
Author: Xinchen Hui <laruence@php.net> Mon, 9 Mar 2015 00:17:52 +0800
Parents: 1638db71fd031bba46e5512c0c3de0034ab233c9
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=51b96086d7e7f160256f8f1dd76df19ba0ddd091
Log:
Revert "Fixed memleak in alloc_globals_ctor"
This reverts commit 85316b4bf02f75e6a89efb8b10416a0505a2ae4d.
Changed paths:
M Zend/zend_alloc.c
Diff:
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index c3efad9..b066eb0 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -1950,9 +1950,6 @@ void zend_mm_shutdown(zend_mm_heap *heap, int full, int silent)
#if ZEND_MM_CUSTOM
if (heap->use_custom_heap) {
- if (full) {
- free(heap);
- }
return;
}
#endif