]> granicus.if.org Git - php/commitdiff
Fix bug #49868
authorRasmus Lerdorf <rasmus@php.net>
Sun, 15 Nov 2009 00:24:06 +0000 (00:24 +0000)
committerRasmus Lerdorf <rasmus@php.net>
Sun, 15 Nov 2009 00:24:06 +0000 (00:24 +0000)
main/main.c

index 5742829769a2c300af4dcdae57a79cf335f4ae0d..fd444ab47c187a3d70edf5b78df93a3209f20db8 100644 (file)
@@ -2344,7 +2344,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);