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

Change the way timer queue timer is deleted

Browse Source 
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.
This commit is contained in:
Anatol Belski 2019-02-12 18:30:55 -08:00
parent b86d7738fb
commit 4f4cf9874d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Zend/zend_execute_API.c
View File

@ -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 timer, so we could end up with just an ignored timeout. Instead
delete and recreate. */ delete and recreate. */
if (NULL != tq_timer) { if (NULL != tq_timer) {
if (!DeleteTimerQueueTimer(NULL, tq_timer, NULL)) { if (!DeleteTimerQueueTimer(NULL, tq_timer, INVALID_HANDLE_VALUE)) {
tq_timer = NULL; tq_timer = NULL;
zend_error_noreturn(E_ERROR, "Could not delete queued timer"); zend_error_noreturn(E_ERROR, "Could not delete queued timer");
return; return;
@ -1312,7 +1312,7 @@ void zend_unset_timeout(void) /* {{{ */
{ {
#ifdef ZEND_WIN32 #ifdef ZEND_WIN32
if (NULL != tq_timer) { if (NULL != tq_timer) {
if (!DeleteTimerQueueTimer(NULL, tq_timer, NULL)) { if (!DeleteTimerQueueTimer(NULL, tq_timer, INVALID_HANDLE_VALUE)) {
EG(timed_out) = 0; EG(timed_out) = 0;
tq_timer = NULL; tq_timer = NULL;
zend_error_noreturn(E_ERROR, "Could not delete queued timer"); zend_error_noreturn(E_ERROR, "Could not delete queued timer");