archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-21 01:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

MFB: Increased default memory limit to 16 megabytes to accommodate for a

Browse source 
more accurate memory utilization measurement.
This commit is contained in:
Ilia Alshanetsky 2006-08-17 13:43:51 +00:00
parent e1efd7c87b
commit 2ae992d772
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
main/main.c
View file

@ -409,7 +409,7 @@ PHP_INI_BEGIN()
PHP_INI_ENTRY("smtp_port", "25", PHP_INI_ALL, NULL) PHP_INI_ENTRY("smtp_port", "25", PHP_INI_ALL, NULL)
PHP_INI_ENTRY("browscap", NULL, PHP_INI_SYSTEM, NULL) PHP_INI_ENTRY("browscap", NULL, PHP_INI_SYSTEM, NULL)
#if MEMORY_LIMIT #if MEMORY_LIMIT
PHP_INI_ENTRY("memory_limit", "8M", PHP_INI_ALL, OnChangeMemoryLimit) PHP_INI_ENTRY("memory_limit", "16M", PHP_INI_ALL, OnChangeMemoryLimit)
#endif #endif
PHP_INI_ENTRY("precision", "14", PHP_INI_ALL, OnSetPrecision) PHP_INI_ENTRY("precision", "14", PHP_INI_ALL, OnSetPrecision)
PHP_INI_ENTRY("sendmail_from", NULL, PHP_INI_ALL, NULL) PHP_INI_ENTRY("sendmail_from", NULL, PHP_INI_ALL, NULL)

2
php.ini-dist
View file

@ -201,7 +201,7 @@ expose_php = On
max_execution_time = 30 ; Maximum execution time of each script, in seconds 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 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)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

2
php.ini-recommended
View file

@ -234,7 +234,7 @@ expose_php = On
max_execution_time = 30 ; Maximum execution time of each script, in seconds 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 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)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;