From: Ilia Alshanetsky <iliaa@php.net>
Date: Sun, 17 Nov 2002 22:53:35 +0000 (+0000)
Subject: MFH
X-Git-Tag: php-4.3.0RC2~107
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d9e33dbaec57889db9425d876d266b2800187421;p=php

MFH
---

diff --git a/main/main.c b/main/main.c
index f323f3e1fb..5cf1ac2ef2 100644
--- a/main/main.c
+++ b/main/main.c
@@ -79,6 +79,7 @@
 #include "zend_highlight.h"
 #include "zend_indent.h"
 #include "zend_extensions.h"
+#include "zend_ini.h"
 
 #include "php_content_types.h"
 #include "php_ticks.h"
@@ -1544,7 +1545,7 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC)
 		php_mb_set_zend_encoding(TSRMLS_C);
 #endif /* ZEND_MULTIBYTE && HAVE_MBSTRING */
 		zend_unset_timeout(TSRMLS_C);
-		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);
 		
 		if (old_primary_file_path) {