From: foobar <sniper@php.net>
Date: Thu, 23 Jan 2003 05:15:42 +0000 (+0000)
Subject: Fixed bug: #14542, register_shutdown_function() timeout problem
X-Git-Tag: PHP_5_0_dev_before_13561_fix~85
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a93625e4cb0ae671d42bb3b073125d142adb530;p=php

Fixed bug: #14542, register_shutdown_function() timeout problem
---

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 9e7f8e5c7b..e5641f91e2 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -838,11 +838,12 @@ ZEND_API void zend_timeout(int dummy)
 {
 	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");
 }