From b9262130fec34137e38c922015c6b671c0fa9396 Mon Sep 17 00:00:00 2001
From: Divy Srivastava <dj.srivastava23@gmail.com>
Date: Thu, 7 Nov 2024 17:12:13 +0530
Subject: feat(ext/http): abort signal when request is cancelled (#26761)

Closes https://github.com/denoland/deno/issues/21653
---
 ext/fetch/23_request.js | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'ext/fetch/23_request.js')

diff --git a/ext/fetch/23_request.js b/ext/fetch/23_request.js
index 6211e927d..22c17d6d2 100644
--- a/ext/fetch/23_request.js
+++ b/ext/fetch/23_request.js
@@ -269,19 +269,25 @@ class Request {
   /** @type {AbortSignal} */
   get [_signal]() {
     const signal = this[_signalCache];
-    // This signal not been created yet, and the request is still in progress
-    if (signal === undefined) {
+    // This signal has not been created yet, but the request has already completed
+    if (signal === false) {
       const signal = newSignal();
       this[_signalCache] = signal;
+      signal[signalAbort](signalAbortError);
       return signal;
     }
-    // This signal has not been created yet, but the request has already completed
-    if (signal === false) {
+
+    // This signal not been created yet, and the request is still in progress
+    if (signal === undefined) {
       const signal = newSignal();
       this[_signalCache] = signal;
-      signal[signalAbort](signalAbortError);
       return signal;
     }
+
+    if (!signal.aborted && this[_request].isCancelled) {
+      signal[signalAbort](signalAbortError);
+    }
+
     return signal;
   }
   get [_mimeType]() {
-- 
cgit v1.2.3