cvs: Zend(PHP_4_3) / zend_execute_API.c
| From: | Jani Taskinen | Date: | Thu, 23 Jan 2003 05:16:12 +0000 |
| Subject: | cvs: Zend(PHP_4_3) / zend_execute_API.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-843@lists.php.net to get a copy of this message | ||
sniper Thu Jan 23 00:16:12 2003 EDT
Modified files: (Branch: PHP_4_3)
/Zend zend_execute_API.c
Log:
MFH: Fixed bug: #14542, register_shutdown_function() timeout problem
Index: Zend/zend_execute_API.c
diff -u Zend/zend_execute_API.c:1.155.2.2 Zend/zend_execute_API.c:1.155.2.3
--- Zend/zend_execute_API.c:1.155.2.2 Tue Dec 31 11:23:00 2002
+++ Zend/zend_execute_API.c Thu Jan 23 00:16:12 2003
@@ -715,11 +715,12 @@
{
TSRMLS_FETCH();
- zend_error(E_ERROR, "Maximum execution time of %d second%s exceeded",
- EG(timeout_seconds), EG(timeout_seconds) == 1 ? "" : "s");
if (zend_on_timeout) {
zend_on_timeout(EG(timeout_seconds) TSRMLS_CC);
}
+
+ zend_error(E_ERROR, "Maximum execution time of %d second%s exceeded",
+ EG(timeout_seconds), EG(timeout_seconds) == 1 ? "" : "s");
}