run the timers after the polling

Refs: libuv/libuv#3686
mmomtchev · Aug 31, 2022 · 423c619 · 423c619
1 parent 69e6cf4
commit 423c619
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/deps/uv/src/unix/core.c b/deps/uv/src/unix/core.c
@@ -377,7 +377,6 @@ int uv_run(uv_loop_t* loop, uv_run_mode mode) {
 
   while (r != 0 && loop->stop_flag == 0) {
     uv__update_time(loop);
-    uv__run_timers(loop);
     ran_pending = uv__run_pending(loop);
     uv__run_idle(loop);
     uv__run_prepare(loop);
@@ -395,6 +394,8 @@ int uv_run(uv_loop_t* loop, uv_run_mode mode) {
      */
     uv__metrics_update_idle_time(loop);
 
+    uv__run_timers(loop);
+
     uv__run_check(loop);
     uv__run_closing_handles(loop);
 

diff --git a/test/parallel/test-http-client-response-timeout.js b/test/parallel/test-http-client-response-timeout.js
@@ -9,6 +9,6 @@ server.listen(common.mustCall(() => {
     http.get({ port: server.address().port }, common.mustCall((res) => {
       res.on('timeout', common.mustCall(() => req.destroy()));
       res.setTimeout(1);
-      server.close();
+      setTimeout(() => server.close(), 2);
     }));
 }));