From: Antony Dovgal <tony2001@php.net>
Date: Wed, 14 Mar 2007 11:58:05 +0000 (+0000)
Subject: MFH: fix #40800 (cannot disable memory_limit with -1)
X-Git-Tag: php-5.2.2RC1~151
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e5b5f00949718f15c62750a771549e3dcc88a92d;p=php

MFH: fix #40800 (cannot disable memory_limit with -1)
---

diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 34f5b77b60..96999acc99 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -2060,7 +2060,7 @@ ZEND_API char *zend_strndup(const char *s, uint length)
 }
 
 
-ZEND_API int zend_set_memory_limit(unsigned int memory_limit)
+ZEND_API int zend_set_memory_limit(size_t memory_limit)
 {
 	TSRMLS_FETCH();
 
diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h
index c77ab47028..93555fbf7a 100644
--- a/Zend/zend_alloc.h
+++ b/Zend/zend_alloc.h
@@ -124,7 +124,7 @@ inline static void * __zend_realloc(void *p, size_t len)
 #define safe_estrdup(ptr)  ((ptr)?(estrdup(ptr)):STR_EMPTY_ALLOC())
 #define safe_estrndup(ptr, len) ((ptr)?(estrndup((ptr), (len))):STR_EMPTY_ALLOC())
 
-ZEND_API int zend_set_memory_limit(unsigned int memory_limit);
+ZEND_API int zend_set_memory_limit(size_t memory_limit);
 
 ZEND_API void start_memory_manager(TSRMLS_D);
 ZEND_API void shutdown_memory_manager(int silent, int full_shutdown TSRMLS_DC);