diff options
| -rw-r--r-- | sapi/cli/README | 1 | ||||
| -rw-r--r-- | sapi/cli/php_cli.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/sapi/cli/README b/sapi/cli/README index bede428f9b..040e224cb0 100644 --- a/sapi/cli/README +++ b/sapi/cli/README @@ -15,3 +15,4 @@ The main differences between the two: * implicit_flush always on * -r option which allows execution of PHP code directly from the command line (e.g. php -r 'echo md5("test");' ) +* max_execution_time is set to unlimited, overriding php.ini setting. diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 949c8667f4..94d022b869 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -397,6 +397,7 @@ int main(int argc, char *argv[]) SG(options) |= SAPI_OPTION_NO_CHDIR; zend_alter_ini_entry("html_errors", 12, "0", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE); zend_alter_ini_entry("implicit_flush", 15, "1", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE); + zend_alter_ini_entry("max_execution_time", 19, "0", 1, PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE); while ((c = ap_php_getopt(argc, argv, OPTSTRING)) != -1) { switch (c) { |