From 423c619aa0324342cfa0fc7e6db8569539e10732 Mon Sep 17 00:00:00 2001
From: Momtchil Momtchev <momtchil@momtchev.com>
Date: Sat, 30 Jul 2022 08:21:22 +0000
Subject: [PATCH] run the timers after the polling

Refs: https://github.com/libuv/libuv/issues/3686
---
 deps/uv/src/unix/core.c                            | 3 ++-
 test/parallel/test-http-client-response-timeout.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/deps/uv/src/unix/core.c b/deps/uv/src/unix/core.c
index 66f09cb2804bb0..f3c009de2b52db 100644
--- 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
index 7e44d83a831143..6f9b490e551e66 100644
--- 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);
     }));
 }));