iliaa Thu Aug 17 13:43:51 2006 UTC
Modified files:
/php-src/main main.c
/php-src php.ini-dist php.ini-recommended
Log:
MFB: Increased default memory limit to 16 megabytes to accommodate for a
more accurate memory utilization measurement.
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.699&r2=1.700&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.699 php-src/main/main.c:1.700
--- php-src/main/main.c:1.699 Wed Jul 19 12:25:02 2006
+++ php-src/main/main.c Thu Aug 17 13:43:51 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.699 2006/07/19 12:25:02 mike Exp $ */
+/* $Id: main.c,v 1.700 2006/08/17 13:43:51 iliaa Exp $ */
/* {{{ includes
*/
@@ -409,7 +409,7 @@
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)
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.252&r2=1.253&diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.252 php-src/php.ini-dist:1.253
--- php-src/php.ini-dist:1.252 Mon Aug 14 18:39:30 2006
+++ php-src/php.ini-dist Thu Aug 17 13:43:51 2006
@@ -201,7 +201,7 @@
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)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.201&r2=1.202&diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.201 php-src/php.ini-recommended:1.202
--- php-src/php.ini-recommended:1.201 Mon Aug 14 18:39:30 2006
+++ php-src/php.ini-recommended Thu Aug 17 13:43:51 2006
@@ -234,7 +234,7 @@
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)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
