cvs: ZendEngine2 / zend_execute_API.c
| From: | Jani Taskinen | Date: | Thu, 23 Jan 2003 05:15:43 +0000 |
| Subject: | cvs: ZendEngine2 / zend_execute_API.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-842@lists.php.net to get a copy of this message | ||
sniper Thu Jan 23 00:15:43 2003 EDT
Modified files:
/ZendEngine2 zend_execute_API.c
Log:
Fixed bug: #14542, register_shutdown_function() timeout problem
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.188 ZendEngine2/zend_execute_API.c:1.189
--- ZendEngine2/zend_execute_API.c:1.188 Sun Jan 12 07:39:06 2003
+++ ZendEngine2/zend_execute_API.c Thu Jan 23 00:15:42 2003
@@ -838,11 +838,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");
}