From b75a22b203f7859a42856d3c59a4a755997d8882 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Thu, 11 May 2006 22:08:55 +0000 Subject: [PATCH] Fixed bug #37306 (max_execution_time = max_input_time). --- main/main.c | 4 ++-- sapi/cli/php_cli.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/main/main.c b/main/main.c index 09d8ad2c54..d67a80155b 100644 --- a/main/main.c +++ b/main/main.c @@ -1871,11 +1871,11 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC) } else { append_file_p = NULL; } - if (PG(max_input_time) == -1) { + if (PG(max_input_time) != -1) { #ifdef PHP_WIN32 zend_unset_timeout(TSRMLS_C); #endif - zend_set_timeout(EG(timeout_seconds)); + zend_set_timeout(INI_INT("max_execution_time")); } retval = (zend_execute_scripts(ZEND_REQUIRE TSRMLS_CC, NULL, 3, prepend_file_p, primary_file, append_file_p) == SUCCESS); diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 476d0d6c79..c4b05786d7 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -111,8 +111,8 @@ "register_argc_argv=1\n" \ "implicit_flush=1\n" \ "output_buffering=0\n" \ - "max_execution_time=0\n" - + "max_execution_time=0\n" \ + "max_input_time=-1\n" static char *php_optarg = NULL; static int php_optind = 1; -- 2.40.0