diff options
| author | Anatol Belski <ab@php.net> | 2019-02-12 18:30:55 -0800 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2019-02-12 18:30:55 -0800 |
| commit | 4f4cf9874d863f69782383e6c34d12eaf43fd2bc (patch) | |
| tree | ada908645b305c5710e9098cb9e7db7588beb675 /Zend/zend_execute_API.c | |
| parent | b86d7738fb3bc0e0e491a7815f3e763d1464b9b1 (diff) | |
| download | php-git-4f4cf9874d863f69782383e6c34d12eaf43fd2bc.tar.gz | |
Change the way timer queue timer is deleted
As discussed in bug #77580, passing INVALID_HANDLE_VALUE for the
completion event improves compatibility with Wine/ReactOS. The timer
callback itself is supposed to complete fast enough, no behavior change
is to expect.
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index f5d08f1f0d..048e0af967 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -1238,7 +1238,7 @@ static void zend_set_timeout_ex(zend_long seconds, int reset_signals) /* {{{ */ timer, so we could end up with just an ignored timeout. Instead delete and recreate. */ if (NULL != tq_timer) { - if (!DeleteTimerQueueTimer(NULL, tq_timer, NULL)) { + if (!DeleteTimerQueueTimer(NULL, tq_timer, INVALID_HANDLE_VALUE)) { tq_timer = NULL; zend_error_noreturn(E_ERROR, "Could not delete queued timer"); return; @@ -1312,7 +1312,7 @@ void zend_unset_timeout(void) /* {{{ */ { #ifdef ZEND_WIN32 if (NULL != tq_timer) { - if (!DeleteTimerQueueTimer(NULL, tq_timer, NULL)) { + if (!DeleteTimerQueueTimer(NULL, tq_timer, INVALID_HANDLE_VALUE)) { EG(timed_out) = 0; tq_timer = NULL; zend_error_noreturn(E_ERROR, "Could not delete queued timer"); |