Default memory_limit value is set to 128M

diff --git a/NEWS b/NEWS
index 8aa6279f0157de11142e2681c461184c1c6e402c..3244b032850daba7c61e9f3ed0ad2ddaf14b9770 100644 (file)
--- 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 f9f21ae478c7c251d00f18a39f4b3ee41c0edd68..e56d70940e92be2e1530f736f382745562c810b3 100644 (file)
--- 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 d8cf3f676239a944d2ff218c58c754754d2a6c5d..9f88f751d9eec1ee4972a9347cdbf4a90856fac5 100644 (file)
--- 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 8e106c0019c199ad0354b14cf9982ec509317789..6080cb16cd5af2ebb64d951436998ab99dd64614 100644 (file)
--- 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)
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;