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

derick Sun Sep 2 19:57:21 2007 UTC Modified files: /php-src php.ini-dist php.ini-recommended Log: - Avoid confusion. http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.268&r2=1.269&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.268 php-src/php.ini-dist:1.269 --- php-src/php.ini-dist:1.268 Tue Aug 21 23:24:01 2007 +++ php-src/php.ini-dist Sun Sep 2 19:57:21 2007 @@ -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 ;max_input_nesting_level = 64 ; Maximum input variable nesting level -memory_limit = 128M ; Maximum amount of memory a script may consume (128MB) +memory_limit = 128M ; Maximum amount of memory a script may consume (128M) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.218&r2=1.219&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.218 php-src/php.ini-recommended:1.219 --- php-src/php.ini-recommended:1.218 Tue Aug 21 23:24:01 2007 +++ php-src/php.ini-recommended Sun Sep 2 19:57:21 2007 @@ -238,7 +238,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 ;max_input_nesting_level = 64 ; Maximum input variable nesting level -memory_limit = 128M ; Maximum amount of memory a script may consume (128MB) +memory_limit = 128M ; Maximum amount of memory a script may consume (128M) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;