cvs: php4(PHP_4_3) /main main.c
| From: | Rasmus Lerdorf | Date: | Wed, 26 Feb 2003 22:17:35 +0000 |
| Subject: | cvs: php4(PHP_4_3) /main main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-19217@lists.php.net to get a copy of this message | ||
rasmus Wed Feb 26 17:17:35 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/main main.c
Log:
Get rid of an unnecessary syscall on non-Windows. We don't need two
setitimer() calls here in order to reset the timer.
Index: php4/main/main.c
diff -u php4/main/main.c:1.512.2.11 php4/main/main.c:1.512.2.12
--- php4/main/main.c:1.512.2.11 Wed Feb 19 11:17:34 2003
+++ php4/main/main.c Wed Feb 26 17:17:35 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.512.2.11 2003/02/19 16:17:34 phanto Exp $ */
+/* $Id: main.c,v 1.512.2.12 2003/02/26 22:17:35 rasmus Exp $ */
/* {{{ includes
*/
@@ -1581,7 +1581,9 @@
#if defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING)
php_mb_set_zend_encoding(TSRMLS_C);
#endif /* ZEND_MULTIBYTE && HAVE_MBSTRING */
+#ifdef PHP_WIN32
zend_unset_timeout(TSRMLS_C);
+#endif
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);