com php-src: fix hard_timeout support in shutdown fun ctions: Zend/zend_execute_API.c
| From: | Anatol Belski | Date: | Mon, 06 Jun 2016 06:41:07 +0000 |
| Subject: | com php-src: fix hard_timeout support in shutdown fun ctions: Zend/zend_execute_API.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-92322@lists.php.net to get a copy of this message | ||
Commit: 52ebd5611f5c9ff233f9cce16ec17b4560832af7
Author: Anatol Belski <ab@php.net> Sun, 5 Jun 2016 11:38:12 +0200
Parents: db68121da8e92f91dbda1df8445a650f9f24329f
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=52ebd5611f5c9ff233f9cce16ec17b4560832af7
Log:
fix hard_timeout support in shutdown functions
Changed paths:
M Zend/zend_execute_API.c
Diff:
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index dba10e3..05ee781 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API..c
@@ -1157,8 +1157,22 @@ static void zend_set_timeout_ex(zend_long seconds, int reset_signals);
ZEND_API ZEND_NORETURN void zend_timeout(int dummy) /* {{{ */
{
+#if defined(PHP_WIN32)
+ /* No action is needed if we're timed out because zero seconds are
+ just ignored. Also, the hard timeout needs to be respected. If the
+ timer is not restarted properly, it could hang in the shutdown
+ function. */
+ if (EG(hard_timeout) > 0) {
+ EG(timed_out) = 0;
+ zend_set_timeout_ex(EG(hard_timeout), 1);
+ /* XXX Abused, introduce an additional flag if the value needs to be kept. */
+ EG(hard_timeout) = 0;
+ }
+#else
EG(timed_out) = 0;
zend_set_timeout_ex(0, 1);
+#endif
+
zend_error_noreturn(E_ERROR, "Maximum execution time of %pd second%s exceeded",
EG(timeout_seconds), EG(timeout_seconds) == 1 ? "" : "s");
}
/* }}} */