Skip to content

Commit ba3763f

Browse files
committed
hard_timeout ignored on TS
1 parent 52ebd56 commit ba3763f

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

Zend/zend_execute_API.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,6 +1158,7 @@ static void zend_set_timeout_ex(zend_long seconds, int reset_signals);
11581158
ZEND_API ZEND_NORETURN void zend_timeout(int dummy) /* {{{ */
11591159
{
11601160
#if defined(PHP_WIN32)
1161+
# ifndef ZTS
11611162
/* No action is needed if we're timed out because zero seconds are
11621163
just ignored. Also, the hard timeout needs to be respected. If the
11631164
timer is not restarted properly, it could hang in the shutdown
@@ -1168,6 +1169,7 @@ ZEND_API ZEND_NORETURN void zend_timeout(int dummy) /* {{{ */
11681169
/* XXX Abused, introduce an additional flag if the value needs to be kept. */
11691170
EG(hard_timeout) = 0;
11701171
}
1172+
# endif
11711173
#else
11721174
EG(timed_out) = 0;
11731175
zend_set_timeout_ex(0, 1);

0 commit comments

Comments
 (0)