From: Ilia Alshanetsky Date: Thu, 17 Aug 2006 13:43:51 +0000 (+0000) Subject: MFB: Increased default memory limit to 16 megabytes to accommodate for a X-Git-Tag: RELEASE_1_0_0RC1~1934 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ae992d7725a772380ae6b765d4eebd59cbcee9c;p=php MFB: Increased default memory limit to 16 megabytes to accommodate for a more accurate memory utilization measurement. --- diff --git a/main/main.c b/main/main.c index ce40664b5c..abe09b232d 100644 --- a/main/main.c +++ b/main/main.c @@ -409,7 +409,7 @@ PHP_INI_BEGIN() PHP_INI_ENTRY("smtp_port", "25", PHP_INI_ALL, NULL) PHP_INI_ENTRY("browscap", NULL, PHP_INI_SYSTEM, NULL) #if MEMORY_LIMIT - PHP_INI_ENTRY("memory_limit", "8M", PHP_INI_ALL, OnChangeMemoryLimit) + PHP_INI_ENTRY("memory_limit", "16M", PHP_INI_ALL, OnChangeMemoryLimit) #endif PHP_INI_ENTRY("precision", "14", PHP_INI_ALL, OnSetPrecision) PHP_INI_ENTRY("sendmail_from", NULL, PHP_INI_ALL, NULL) diff --git a/php.ini-dist b/php.ini-dist index f5ec38ed4c..d411ed1b69 100644 --- a/php.ini-dist +++ b/php.ini-dist @@ -201,7 +201,7 @@ expose_php = On max_execution_time = 30 ; Maximum execution time of each script, in seconds max_input_time = 60 ; Maximum amount of time each script may spend parsing request data -memory_limit = 8M ; Maximum amount of memory a script may consume (8MB) +memory_limit = 16M ; Maximum amount of memory a script may consume (16MB) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/php.ini-recommended b/php.ini-recommended index 86c25f8da2..c6458aa11f 100644 --- a/php.ini-recommended +++ b/php.ini-recommended @@ -234,7 +234,7 @@ expose_php = On max_execution_time = 30 ; Maximum execution time of each script, in seconds max_input_time = 60 ; Maximum amount of time each script may spend parsing request data -memory_limit = 8M ; Maximum amount of memory a script may consume (8MB) +memory_limit = 16M ; Maximum amount of memory a script may consume (16MB) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;