dmitry Thu Dec 21 09:12:42 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS php.ini-dist php.ini-recommended
/php-src/main main.c
Log:
Default memory_limit value is set to 128M
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.449&r2=1.2027.2.547.2.450&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.449 php-src/NEWS:1.2027.2.547.2.450
--- php-src/NEWS:1.2027.2.547.2.449 Thu Dec 21 09:01:10 2006
+++ php-src/NEWS Thu Dec 21 09:12:42 2006
@@ -6,6 +6,7 @@
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)
http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.231.2.10.2.13&r2=1.231.2.10.2.14&diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.231.2.10.2.13
php-src/php.ini-dist:1.231.2.10.2.14
--- php-src/php.ini-dist:1.231.2.10.2.13 Tue Dec 19 10:34:10 2006
+++ php-src/php.ini-dist Thu Dec 21 09:12:42 2006
@@ -254,7 +254,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 = 16M ; Maximum amount of memory a script may consume (16MB)
+memory_limit = 128M ; Maximum amount of memory a script may consume (16MB)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.13&r2=1.179.2.11.2.14&diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.179.2.11.2.13
php-src/php.ini-recommended:1.179.2.11.2.14
--- php-src/php.ini-recommended:1.179.2.11.2.13 Tue Dec 19 10:34:10 2006
+++ php-src/php.ini-recommended Thu Dec 21 09:12:42 2006
@@ -299,7 +299,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 = 16M ; Maximum amount of memory a script may consume (16MB)
+memory_limit = 128M ; Maximum amount of memory a script may consume (16MB)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.23&r2=1.640.2.23.2.24&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.23 php-src/main/main.c:1.640.2.23.2.24
--- php-src/main/main.c:1.640.2.23.2.23 Wed Dec 20 10:49:33 2006
+++ php-src/main/main.c Thu Dec 21 09:12:42 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.640.2.23.2.23 2006/12/20 10:49:33 dmitry Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.24 2006/12/21 09:12:42 dmitry Exp $ */
/* {{{ includes
*/
@@ -309,7 +309,7 @@
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)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
