diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2006-08-17 13:43:08 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2006-08-17 13:43:08 +0000 |
| commit | 3a211712eb59b2ad8b623dd6f32bb3a28f10fca7 (patch) | |
| tree | 0c1a63861f7e920258c36c5a2d4fdd641e70cb82 | |
| parent | 3d87be2674027f24e803f205a034c2579a7a82bc (diff) | |
| download | php-git-3a211712eb59b2ad8b623dd6f32bb3a28f10fca7.tar.gz | |
Increased default memory limit to 16 megabytes to accommodate for a more
accurate memory utilization measurement.
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | main/main.c | 2 | ||||
| -rw-r--r-- | php.ini-dist | 2 | ||||
| -rw-r--r-- | php.ini-recommended | 2 |
4 files changed, 6 insertions, 4 deletions
@@ -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) diff --git a/main/main.c b/main/main.c index 215a497dc5..cc44717432 100644 --- a/main/main.c +++ b/main/main.c @@ -312,7 +312,7 @@ PHP_INI_BEGIN() 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) diff --git a/php.ini-dist b/php.ini-dist index 6c825ca8dd..55a3424e6e 100644 --- a/php.ini-dist +++ b/php.ini-dist @@ -253,7 +253,7 @@ expose_php = On 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) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/php.ini-recommended b/php.ini-recommended index c1e7a4cabb..c557806f75 100644 --- a/php.ini-recommended +++ b/php.ini-recommended @@ -311,7 +311,7 @@ expose_php = On 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) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |