cvs: php-src / php.ini-dist php.ini-recommended /main main.c

dmitry Thu Dec 21 09:12:59 2006 UTC Modified files: /php-src 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/php.ini-dist?r1=1.258&r2=1.259&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.258 php-src/php.ini-dist:1.259 --- php-src/php.ini-dist:1.258 Tue Dec 19 10:34:58 2006 +++ php-src/php.ini-dist Thu Dec 21 09:12:59 2006 @@ -202,7 +202,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.207&r2=1.208&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.207 php-src/php.ini-recommended:1.208 --- php-src/php.ini-recommended:1.207 Tue Dec 19 10:34:58 2006 +++ php-src/php.ini-recommended Thu Dec 21 09:12:59 2006 @@ -235,7 +235,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.714&r2=1.715&diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.714 php-src/main/main.c:1.715 --- php-src/main/main.c:1.714 Wed Dec 20 10:50:45 2006 +++ php-src/main/main.c Thu Dec 21 09:12:59 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.714 2006/12/20 10:50:45 dmitry Exp $ */ +/* $Id: main.c,v 1.715 2006/12/21 09:12:59 dmitry Exp $ */ /* {{{ includes */ @@ -407,7 +407,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)