mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 09:54:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

hard_timeout ignored on TS

Browse Source
This commit is contained in:
Anatol Belski 2016-06-06 00:22:04 +02:00
parent 52ebd5611f
commit ba3763fa2d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zend/zend_execute_API.c
View File

@ -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);