dmitry Fri Apr 7 11:44:03 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/main main.c Log: We don't need setup the same time-out two times. http://cvs.php.net/viewcvs.cgi/php-src/main/main.c?r1=1.640.2.21&r2=1.640.2.22&diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.640.2.21 php-src/main/main.c:1.640.2.22 --- php-src/main/main.c:1.640.2.21 Tue Mar 21 08:49:42 2006 +++ php-src/main/main.c Fri Apr 7 11:44:03 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.640.2.21 2006/03/21 08:49:42 dmitry Exp $ */ +/* $Id: main.c,v 1.640.2.22 2006/04/07 11:44:03 dmitry Exp $ */ /* {{{ includes */ @@ -1719,10 +1719,12 @@ } 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();
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php