We don't need setup the same time-out two times.

diff --git a/main/main.c b/main/main.c
index cc7279b39aa91aa06b9da176742b849de1ff9a89..50fc98325313200a161b014782e2dc9a6c98a74c 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -1861,10 +1861,12 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC)
                } else {
                        append_file_p = NULL;
                }
+               if (PG(max_input_time) == -1) {
 #ifdef PHP_WIN32
-               zend_unset_timeout(TSRMLS_C);
+                       zend_unset_timeout(TSRMLS_C);
 #endif
-               zend_set_timeout(INI_INT("max_execution_time"));
+                       zend_set_timeout(EG(timeout_seconds));
+               }
                retval = (zend_execute_scripts(ZEND_REQUIRE TSRMLS_CC, NULL, 3, prepend_file_p, primary_file, append_file_p) == SUCCESS);
 
        } zend_end_try();