Skip to content

Commit b8c4b47

Browse files
committed
run the timers after the polling
Refs: libuv/libuv#3686
1 parent 38b7dc8 commit b8c4b47

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

deps/uv/src/unix/core.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,6 @@ int uv_run(uv_loop_t* loop, uv_run_mode mode) {
377377

378378
while (r != 0 && loop->stop_flag == 0) {
379379
uv__update_time(loop);
380-
uv__run_timers(loop);
381380
ran_pending = uv__run_pending(loop);
382381
uv__run_idle(loop);
383382
uv__run_prepare(loop);
@@ -395,6 +394,8 @@ int uv_run(uv_loop_t* loop, uv_run_mode mode) {
395394
*/
396395
uv__metrics_update_idle_time(loop);
397396

397+
uv__run_timers(loop);
398+
398399
uv__run_check(loop);
399400
uv__run_closing_handles(loop);
400401

test/parallel/test-http-client-response-timeout.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ server.listen(common.mustCall(() => {
99
http.get({ port: server.address().port }, common.mustCall((res) => {
1010
res.on('timeout', common.mustCall(() => req.destroy()));
1111
res.setTimeout(1);
12-
server.close();
12+
setTimeout(() => server.close(), 2);
1313
}));
1414
}));

0 commit comments

Comments
 (0)