diff options
| author | Anatol Belski <ab@php.net> | 2016-06-06 00:22:04 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-06-06 08:41:07 +0200 |
| commit | ba3763fa2dc8ce481b834f9225c6eef3a7369450 (patch) | |
| tree | fe64aad7285decdfb4e274ea68b96e253dbf541e | |
| parent | 52ebd5611f5c9ff233f9cce16ec17b4560832af7 (diff) | |
| download | php-git-ba3763fa2dc8ce481b834f9225c6eef3a7369450.tar.gz | |
hard_timeout ignored on TS
| -rw-r--r-- | Zend/zend_execute_API.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 05ee781bd6..f7bce4f4e5 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); |