http2: use addAbortListener

atlowChemi · juanarbol · commit e4333ac41f36 · 2023-07-13T17:20:01.000-05:00
PR-URL: #48550 Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
diff --git a/lib/internal/http2/core.js b/lib/internal/http2/core.js
@@ -27,6 +27,7 @@ const {
   StringPrototypeSlice,
   Symbol,
   SymbolAsyncDispose,
+  SymbolDispose,
   TypedArrayPrototypeGetLength,
   Uint32Array,
   Uint8Array,
@@ -1811,10 +1812,8 @@ class ClientHttp2Session extends Http2Session {
       if (signal.aborted) {
         aborter();
       } else {
-        signal.addEventListener('abort', aborter);
-        stream.once('close', () => {
-          signal.removeEventListener('abort', aborter);
-        });
+        const disposable = EventEmitter.addAbortListener(signal, aborter);
+        stream.once('close', disposable[SymbolDispose]);
       }
     }
 
