Fixed bug #37306 (max_execution_time = max_input_time)

diff --git a/NEWS b/NEWS
index 58d2d612859a67332dbc451f6f3689a881776bb4..741c56b5b0950914ff15e5f21068bb6c098739bd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,9 +25,11 @@
 - Fixed bug #37348 (make PEAR install ignore open_basedir). (Ilia)
 - Fixed bug #37313 (sigemptyset() used without including <signal.h>).
   (jdolecek)
+- Fixed bug #37306 (max_execution_time = max_input_time). (Dmitry)
 - Fixed bug #37244 (Added strict flag to base64_decode() that enforces 
   RFC3548 compliance). (Ilia)
 
+
 04 May 2006, PHP 5.1.4
 - Added "capture_peer_cert" and "capture_peer_cert_chain" context options
   for SSL streams. (Wez).

diff --git a/main/main.c b/main/main.c
index 55b3d4dbfc621043f436bfc5ac4f8a3231bf22eb..ab35f2ec3d9fda1d7d25db07af8aaf67f5ef9139 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -1729,11 +1729,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 3696a21566dea52c1f5d7124ce842a15730596fe..fe63eeb1ccf811a62682dc0a5f213b693af977fe 100644 (file)
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -708,6 +708,7 @@ int main(int argc, char *argv[])
                INI_HARDCODED("implicit_flush", "1");
                INI_HARDCODED("output_buffering", "0");
                INI_HARDCODED("max_execution_time", "0");
+               INI_HARDCODED("max_input_time", "-1");
 
                while ((c = php_getopt(argc, argv, OPTIONS, &php_optarg, &php_optind, 0)) != -1) {
                        switch (c) {