From: Andi Gutmans <andi@php.net>
Date: Fri, 9 Jun 2000 16:08:30 +0000 (+0000)
Subject: - Fix cache initialization
X-Git-Tag: php-4.0.1RC~324
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=605b1aa3943718c610d3fc3c2af128aa8f7cb972;p=php

- Fix cache initialization
---

diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 02c7030ce0..551100ad46 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -363,7 +363,6 @@ ZEND_API void start_memory_manager(ALS_D)
 	memset(AG(fast_cache_list_head), 0, sizeof(AG(fast_cache_list_head)));
 	memset(AG(cache_count),0,MAX_CACHED_MEMORY*sizeof(unsigned char));
 
-#if 0 /* FIXME: Need to allocate the right amount of memory now */
 #ifndef ZTS
 	/* Initialize cache, to prevent fragmentation */
 	/* We can't do this in ZTS mode, because calling emalloc() from within start_memory_manager()
@@ -371,7 +370,7 @@ ZEND_API void start_memory_manager(ALS_D)
 	 */
 	for (i=1; i<MAX_CACHED_MEMORY; i++) {
 		for (j=0; j<MAX_CACHED_ENTRIES; j++) {
-			cached_entries[i][j] = emalloc(i);
+			cached_entries[i][j] = emalloc(8*i);
 		}
 	}
 	for (i=1; i<MAX_CACHED_MEMORY; i++) {
@@ -380,7 +379,6 @@ ZEND_API void start_memory_manager(ALS_D)
 		}
 	}
 #endif
-#endif
 }