diff options
| author | Anatol Belski <ab@php.net> | 2019-02-12 18:38:15 -0800 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2019-02-12 18:38:15 -0800 |
| commit | 571509f8808407092c63643b2bb82773ac8e1e27 (patch) | |
| tree | 91d97b0c96ec868ab270a782c6ec3ea7407e02f7 /Zend/zend_execute_API.c | |
| parent | d24faba072b977a84db4f163f6d85d4a07761547 (diff) | |
| parent | 4f4cf9874d863f69782383e6c34d12eaf43fd2bc (diff) | |
| download | php-git-571509f8808407092c63643b2bb82773ac8e1e27.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Change the way timer queue timer is deleted
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 de85e2ea6c..ed9dab449e 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -1178,7 +1178,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; @@ -1252,7 +1252,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"); |