From 3ffc1c8f4a1e4c1658f94038e009e226258a65a4 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Thu, 21 Dec 2006 09:12:42 +0000 Subject: [PATCH] Default memory_limit value is set to 128M --- NEWS | 1 + main/main.c | 2 +- php.ini-dist | 2 +- php.ini-recommended | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 8aa6279f0157d..3244b032850da 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,7 @@ PHP NEWS function, that shut downs part of a full-duplex connection. (Dmitry) - Added internal heap protection (Dmitry) . memory-limit is always enabled (--enable-memory-limit removed) + . default value if memory-limit is set to 128M . safe unlinking . cookies . canary protection (debug build only) diff --git a/main/main.c b/main/main.c index f9f21ae478c7c..e56d70940e92b 100644 --- a/main/main.c +++ b/main/main.c @@ -309,7 +309,7 @@ PHP_INI_BEGIN() PHP_INI_ENTRY("SMTP", "localhost",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("memory_limit", "16M", PHP_INI_ALL, OnChangeMemoryLimit) + PHP_INI_ENTRY("memory_limit", "128M", PHP_INI_ALL, OnChangeMemoryLimit) PHP_INI_ENTRY("precision", "14", PHP_INI_ALL, OnSetPrecision) PHP_INI_ENTRY("sendmail_from", NULL, PHP_INI_ALL, NULL) PHP_INI_ENTRY("sendmail_path", DEFAULT_SENDMAIL_PATH, PHP_INI_SYSTEM, NULL) diff --git a/php.ini-dist b/php.ini-dist index d8cf3f676239a..9f88f751d9eec 100644 --- a/php.ini-dist +++ b/php.ini-dist @@ -254,7 +254,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 = 16M ; Maximum amount of memory a script may consume (16MB) +memory_limit = 128M ; Maximum amount of memory a script may consume (16MB) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/php.ini-recommended b/php.ini-recommended index 8e106c0019c19..6080cb16cd5af 100644 --- a/php.ini-recommended +++ b/php.ini-recommended @@ -299,7 +299,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 = 16M ; Maximum amount of memory a script may consume (16MB) +memory_limit = 128M ; Maximum amount of memory a script may consume (16MB) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;