Increased default memory limit to 16 megabytes to accommodate for a more

accurate memory utilization measurement.

diff --git a/NEWS b/NEWS
index 1bd9c83528a98a90035cc5d15d3380f218947b98..1116b79a1ccadf514a2ee92029bf1eacc3c57757 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? Aug 2006, PHP 5.2.0RC2
+17 Aug 2006, PHP 5.2.0RC2
+- Increased default memory limit to 16 megabytes to accommodate for a more
+  accurate memory utilization measurement.
 - Updated libsqlite in ext/pdo_sqlite to 3.3.7. (Ilia)
 - Added support for httpOnly flag for session extension and cookie setting
   functions. (Scott MacVicar, Ilia)

diff --git a/main/main.c b/main/main.c
index 215a497dc5eb766cc5d194658d9fc0b0cfdb2a18..cc44717432b025a8246328291c82266d90caee53 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -312,7 +312,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 6c825ca8dd9e46778dada9bc08a523ee62e5564b..55a3424e6ec18bbe0c2dbdb50332c2a8c4a61a3a 100644 (file)
--- a/php.ini-dist
+++ b/php.ini-dist
@@ -253,7 +253,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 c1e7a4cabb4485ccfdf4cfac0ef623c1c0c513e7..c557806f7517e0a09c1907d2b7c74b6314043376 100644 (file)
--- a/php.ini-recommended
+++ b/php.ini-recommended
@@ -311,7 +311,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)
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;