From: Dmitry Stogov <dmitry@php.net>
Date: Thu, 11 May 2006 22:10:31 +0000 (+0000)
Subject: Fixed bug #37306 (max_execution_time = max_input_time)
X-Git-Tag: php-5.2.0RC1~582
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f41b288e9bca992262f2fefcee0e427aca3d7c0;p=php

Fixed bug #37306 (max_execution_time = max_input_time)
---

diff --git a/NEWS b/NEWS
index 58d2d61285..741c56b5b0 100644
--- 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 55b3d4dbfc..ab35f2ec3d 100644
--- 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 3696a21566..fe63eeb1cc 100644
--- 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) {