Fixed bug #37306 (max_execution_time = max_input_time).

diff --git a/main/main.c b/main/main.c
index 09d8ad2c54de79820ad29bafb47c0281dd6a1fc4..d67a80155b11a281d8efa116c9e2d43e98c5c7d8 100644 (file)
--- 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 476d0d6c7934aaffd5d8911744d20c77ba0e9dde..c4b05786d7939513592df7efdd60f4493067b2da 100644 (file)
--- 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;