com php-src: hard_timeout ignored on TS: Zend/zend _execute_API.c
| From: | Anatol Belski | Date: | Mon, 06 Jun 2016 06:41:07 +0000 |
| Subject: | com php-src: hard_timeout ignored on TS: Zend/zend _execute_API.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-92323@lists.php.net to get a copy of this message | ||
Commit: ba3763fa2dc8ce481b834f9225c6eef3a7369450
Author: Anatol Belski <ab@php.net> Mon, 6 Jun 2016 00:22:04 +0200
Parents: 52ebd5611f5c9ff233f9cce16ec17b4560832af7
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ba3763fa2dc8ce481b834f9225c6eef3a7369450
Log:
hard_timeout ignored on TS
Changed paths:
M Zend/zend_execute_API.c
Diff:
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 05ee781..f7bce4f 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1158,6 +1158,7 @@ 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)
+# ifndef ZTS
/* 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
@@ -1168,6 +1169,7 @@ ZEND_API ZEND_NORETURN void zend_timeout(int dummy) /* {{{ */
/* XXX Abused, introduce an additional flag if the value needs to be kept. */
EG(hard_timeout) = 0;
}
+# endif
#else
EG(timed_out) = 0;
zend_set_timeout_ex(0, 1);