fix: remove broken guard checks

nodejs · May 30, 2022 · f460eae · f460eae
1 parent e500a58
commit f460eae
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/lib/fetch/headers.js b/lib/fetch/headers.js
@@ -111,6 +111,11 @@ class HeadersList {
     }
   }
 
+  clear () {
+    this[kHeadersMap].clear()
+    this[kHeadersSortedMap] = null
+  }
+
   append (name, value) {
     this[kHeadersSortedMap] = null
 
@@ -210,12 +215,8 @@ class Headers {
     // Note: undici does not implement forbidden header names
     if (this[kGuard] === 'immutable') {
       throw new TypeError('immutable')
-    } else if (this[kGuard] === 'request') {
-      return
     } else if (this[kGuard] === 'request-no-cors') {
       // TODO
-    } else if (this[kGuard] === 'response') {
-      return
     }
 
     return this[kHeadersList].append(String(name), String(value))
@@ -236,12 +237,8 @@ class Headers {
     // Note: undici does not implement forbidden header names
     if (this[kGuard] === 'immutable') {
       throw new TypeError('immutable')
-    } else if (this[kGuard] === 'request') {
-      return
     } else if (this[kGuard] === 'request-no-cors') {
       // TODO
-    } else if (this[kGuard] === 'response') {
-      return
     }
 
     return this[kHeadersList].delete(String(name))
@@ -292,12 +289,8 @@ class Headers {
     // Note: undici does not implement forbidden header names
     if (this[kGuard] === 'immutable') {
       throw new TypeError('immutable')
-    } else if (this[kGuard] === 'request') {
-      return
     } else if (this[kGuard] === 'request-no-cors') {
       // TODO
-    } else if (this[kGuard] === 'response') {
-      return
     }
 
     return this[kHeadersList].set(String(name), String(value))

diff --git a/lib/fetch/request.js b/lib/fetch/request.js
@@ -383,10 +383,10 @@ class Request {
     // 30. Set this’s headers to a new Headers object with this’s relevant
     // Realm, whose header list is request’s header list and guard is
     // "request".
-    this[kHeaders] = new Headers(request.headersList)
+    this[kHeaders] = new Headers()
+    this[kHeaders][kHeadersList] = request.headersList
     this[kHeaders][kGuard] = 'request'
     this[kHeaders][kRealm] = this[kRealm]
-    this[kState].headersList = this[kHeaders][kHeadersList]
 
     // 31. If this’s request’s mode is "no-cors", then:
     if (mode === 'no-cors') {
@@ -414,8 +414,7 @@ class Request {
       }
 
       // 3. Empty this’s headers’s header list.
-      this[kHeaders] = new Headers()
-      this[kState].headersList = this[kHeaders][kHeadersList]
+      this[kHeaders][kHeadersList].clear()
 
       // 4. If headers is a Headers object, then for each header in its header
       // list, append header’s name/header’s value to this’s headers.