Merge branch 'main' into deno_bump

denoland · Aug 12, 2023 · e6a0af4 · e6a0af4
2 parents 24630d5 + 396498b
commit e6a0af4
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/ext/fetch/23_request.js b/ext/fetch/23_request.js
@@ -366,20 +366,16 @@ class Request {
  this[_headers] = headersFromHeaderList(request.headerList, "request");
 
  // 32.
- if (ObjectKeys(init).length > 0) {
- let headers = ArrayPrototypeSlice(
- headerListFromHeaders(this[_headers]),
+ if (init.headers || ObjectKeys(init).length > 0) {
+ const headerList = headerListFromHeaders(this[_headers]);
+ const headers = init.headers ?? ArrayPrototypeSlice(
+ headerList,
  0,
- headerListFromHeaders(this[_headers]).length,
+ headerList.length,
  );
- if (init.headers !== undefined) {
- headers = init.headers;
+ if (headerList.length !== 0) {
+ ArrayPrototypeSplice(headerList, 0, headerList.length);
  }
- ArrayPrototypeSplice(
- headerListFromHeaders(this[_headers]),
- 0,
- headerListFromHeaders(this[_headers]).length,
- );
  fillHeaders(this[_headers], headers);
  }