From: Dmitry Stogov <dmitry@php.net>
Date: Fri, 7 Apr 2006 11:44:03 +0000 (+0000)
Subject: We don't need setup the same time-out two times.
X-Git-Tag: php-5.1.3RC3~80
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ead7652457b9add204a1bd372a197afe134ba662;p=php

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

diff --git a/main/main.c b/main/main.c
index 4515e02c69..05612e664c 100644
--- a/main/main.c
+++ b/main/main.c
@@ -1719,10 +1719,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();