From: Zeev Suraski Date: Mon, 26 Jun 2000 16:34:12 +0000 (+0000) Subject: max_execution_time is no longer UNIX only... X-Git-Tag: php-4.0.1RC2~25 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0beee41fc60a91786111dcbf337bc7475693f6b0;p=php max_execution_time is no longer UNIX only... --- 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)