iliaa           Thu Aug 17 13:43:08 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/main       main.c 
    /php-src    php.ini-dist php.ini-recommended NEWS 
  Log:
  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.640.2.23.2.12&r2=1.640.2.23.2.13&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.12 php-src/main/main.c:1.640.2.23.2.13
--- php-src/main/main.c:1.640.2.23.2.12 Wed Jul 19 12:25:46 2006
+++ php-src/main/main.c Thu Aug 17 13:43:08 2006
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.640.2.23.2.12 2006/07/19 12:25:46 mike Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.13 2006/08/17 13:43:08 iliaa Exp $ */
 
 /* {{{ includes
  */
@@ -312,7 +312,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.231.2.10.2.5&r2=1.231.2.10.2.6&diff_format=u
Index: php-src/php.ini-dist
diff -u php-src/php.ini-dist:1.231.2.10.2.5 php-src/php.ini-dist:1.231.2.10.2.6
--- php-src/php.ini-dist:1.231.2.10.2.5 Mon Aug 14 18:40:08 2006
+++ php-src/php.ini-dist        Thu Aug 17 13:43:08 2006
@@ -253,7 +253,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.179.2.11.2.4&r2=1.179.2.11.2.5&diff_format=u
Index: php-src/php.ini-recommended
diff -u php-src/php.ini-recommended:1.179.2.11.2.4 
php-src/php.ini-recommended:1.179.2.11.2.5
--- php-src/php.ini-recommended:1.179.2.11.2.4  Mon Aug 14 18:40:08 2006
+++ php-src/php.ini-recommended Thu Aug 17 13:43:08 2006
@@ -311,7 +311,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/NEWS?r1=1.2027.2.547.2.207&r2=1.2027.2.547.2.208&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.207 php-src/NEWS:1.2027.2.547.2.208
--- php-src/NEWS:1.2027.2.547.2.207     Tue Aug 15 22:48:07 2006
+++ php-src/NEWS        Thu Aug 17 13:43:08 2006
@@ -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)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to