From 3eb6d65ece1d6661cbc730fe78430d2485d25e1d Mon Sep 17 00:00:00 2001
From: Zeev Suraski <zeev@php.net>
Date: Fri, 29 Jun 2001 00:36:34 +0000
Subject: [PATCH] Fix memory_limit, kill warning

---
 Zend/zend_alloc.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 04e7ce517c..632e13aeeb 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -386,9 +386,11 @@ ZEND_API int zend_set_memory_limit(unsigned int memory_limit)
 
 ZEND_API void start_memory_manager(ALS_D)
 {
+#if 0
 #ifndef ZTS
 	int i, j;
 	void *cached_entries[MAX_CACHED_MEMORY][MAX_CACHED_ENTRIES];
+#endif
 #endif
 
 	AG(phead) = AG(head) = NULL;
@@ -454,6 +456,9 @@ ZEND_API void shutdown_memory_manager(int silent, int clean_cache)
 
 		for (i=1; i<MAX_CACHED_MEMORY; i++) {
 			for (j=0; j<AG(cache_count)[i]; j++) {
+#if MEMORY_LIMIT
+				AG(allocated_memory) -= REAL_SIZE(ptr->size);
+#endif
 				ptr = (zend_mem_header *) AG(cache)[i][j];
 				REMOVE_POINTER_FROM_LIST(ptr);
 				free(ptr);
-- 
2.50.1