diff options
| author | Zeev Suraski <zeev@php.net> | 2000-06-26 16:34:12 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2000-06-26 16:34:12 +0000 |
| commit | 0beee41fc60a91786111dcbf337bc7475693f6b0 (patch) | |
| tree | ca600cdfff7e7b76b5b0a4016bd5b6430aebb983 | |
| parent | 378440f7cff664b5d8a00b372b77e9ebae2d15d9 (diff) | |
| download | php-git-0beee41fc60a91786111dcbf337bc7475693f6b0.tar.gz | |
max_execution_time is no longer UNIX only...
| -rw-r--r-- | php.ini-dist | 2 | ||||
| -rw-r--r-- | php.ini-optimized | 2 | ||||
| -rw-r--r-- | php.ini-recommended | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/php.ini-dist b/php.ini-dist index 2532c41e2e..ad93fe1926 100644 --- a/php.ini-dist +++ b/php.ini-dist @@ -133,7 +133,7 @@ expose_php = On ; Decides whether PHP may expose the fact that it is installed ; Resource Limits ; ;;;;;;;;;;;;;;;;;;; -max_execution_time = 30 ; Maximum execution time of each script, in seconds (UNIX only) +max_execution_time = 30 ; Maximum execution time of each script, in seconds memory_limit = 8388608 ; Maximum amount of memory a script may consume (8MB) diff --git a/php.ini-optimized b/php.ini-optimized index 2306212944..0dc78b5d3b 100644 --- a/php.ini-optimized +++ b/php.ini-optimized @@ -121,7 +121,7 @@ expose_php = On ; Decides whether PHP may expose the fact that it is installed ; Resource Limits ; ;;;;;;;;;;;;;;;;;;; -max_execution_time = 30 ; Maximum execution time of each script, in seconds (UNIX only) +max_execution_time = 30 ; Maximum execution time of each script, in seconds memory_limit = 8388608 ; Maximum amount of memory a script may consume (8MB) diff --git a/php.ini-recommended b/php.ini-recommended index 2306212944..0dc78b5d3b 100644 --- a/php.ini-recommended +++ b/php.ini-recommended @@ -121,7 +121,7 @@ expose_php = On ; Decides whether PHP may expose the fact that it is installed ; Resource Limits ; ;;;;;;;;;;;;;;;;;;; -max_execution_time = 30 ; Maximum execution time of each script, in seconds (UNIX only) +max_execution_time = 30 ; Maximum execution time of each script, in seconds memory_limit = 8388608 ; Maximum amount of memory a script may consume (8MB) |