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

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

diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 03914cc629..c7add96697 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -2133,7 +2133,7 @@ ZEND_API zstr zend_zstrndup(int type, const zstr 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 b8da3bdc2a..d3db8ca9ac 100644
--- a/Zend/zend_alloc.h
+++ b/Zend/zend_alloc.h
@@ -117,7 +117,7 @@ ZEND_API size_t _zend_mem_block_size(void *ptr TSRMLS_DC ZEND_FILE_LINE_DC ZEND_
 #define safe_eustrdup(ptr)  ((ptr)?(eustrdup((ptr))):STR_EMPTY_ALLOC())
 #define safe_eustrndup(ptr, len) ((ptr)?(eustrndup((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);