From: Rasmus Lerdorf <rasmus@php.net>
Date: Sun, 15 Nov 2009 00:21:31 +0000 (+0000)
Subject: Fix bug #49868
X-Git-Tag: php-5.3.2RC1~235
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4e6b9899a5cc8852180ab305d357b6548a28b4db;p=php

Fix bug #49868
As far as I can tell this was a copy-paste induced bug when I added
the reset_signals flag to zend_set_timeout.
---

diff --git a/main/main.c b/main/main.c
index 12c35ac639..433c9d6b6b 100644
--- a/main/main.c
+++ b/main/main.c
@@ -2226,7 +2226,7 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC)
 #ifdef PHP_WIN32
 			zend_unset_timeout(TSRMLS_C);
 #endif
-			zend_set_timeout(EG(timeout_seconds), 0);
+                        zend_set_timeout(INI_INT("max_execution_time"), 0);
 		}
 		retval = (zend_execute_scripts(ZEND_REQUIRE TSRMLS_CC, NULL, 3, prepend_file_p, primary_file, append_file_p) == SUCCESS);