Revert "fix(extensions/fetch): Add Origin header to outgoing requests…

… for fetch (#11557)" (#11565) This reverts commit f87aa44.
denoland · Aug 2, 2021 · 505d253 · 505d253
1 parent 3a2e944
commit 505d253
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/cli/tests/unit/fetch_test.ts b/cli/tests/unit/fetch_test.ts
@@ -677,7 +677,6 @@ unitTest(
       "POST /blah HTTP/1.1\r\n",
       "hello: World\r\n",
       "foo: Bar\r\n",
-      "origin: http://js-unit-tests\r\n",
       "accept: */*\r\n",
       `user-agent: Deno/${Deno.version.deno}\r\n`,
       "accept-encoding: gzip, br\r\n",
@@ -713,7 +712,6 @@ unitTest(
       "hello: World\r\n",
       "foo: Bar\r\n",
       "content-type: text/plain;charset=UTF-8\r\n",
-      "origin: http://js-unit-tests\r\n",
       "accept: */*\r\n",
       `user-agent: Deno/${Deno.version.deno}\r\n`,
       "accept-encoding: gzip, br\r\n",
@@ -751,7 +749,6 @@ unitTest(
       "POST /blah HTTP/1.1\r\n",
       "hello: World\r\n",
       "foo: Bar\r\n",
-      "origin: http://js-unit-tests\r\n",
       "accept: */*\r\n",
       `user-agent: Deno/${Deno.version.deno}\r\n`,
       "accept-encoding: gzip, br\r\n",
@@ -1131,7 +1128,6 @@ unitTest(
       "POST /blah HTTP/1.1\r\n",
       "hello: World\r\n",
       "foo: Bar\r\n",
-      "origin: http://js-unit-tests\r\n",
       "accept: */*\r\n",
       `user-agent: Deno/${Deno.version.deno}\r\n`,
       "accept-encoding: gzip, br\r\n",

diff --git a/extensions/fetch/26_fetch.js b/extensions/fetch/26_fetch.js
@@ -40,8 +40,6 @@
     TypeError,
     Uint8Array,
   } = window.__bootstrap.primordials;
-  const { getLocationHref } = window.__bootstrap.location;
-  const { URL } = window.__bootstrap.url;
 
   const REQUEST_BODY_HEADER_NAMES = [
     "content-encoding",
@@ -431,17 +429,6 @@
       }
       requestObject.signal[abortSignal.add](onabort);
 
-      const baseURL = getLocationHref();
-      if (
-        baseURL &&
-        (requestObject.method !== "GET" && requestObject.method !== "HEAD")
-      ) {
-        ArrayPrototypePush(request.headerList, [
-          "origin",
-          new URL(baseURL).origin,
-        ]);
-      }
-
       if (!requestObject.headers.has("accept")) {
         ArrayPrototypePush(request.headerList, ["accept", "*/*"]);
       }

diff --git a/tools/wpt/expectation.json b/tools/wpt/expectation.json
@@ -2646,7 +2646,26 @@
         "request-headers-nonascii.any.html": true,
         "request-headers.any.html": [
           "Fetch with PUT without body",
-          "Fetch with POST without body"
+          "Fetch with PUT with body",
+          "Fetch with POST without body",
+          "Fetch with POST with text body",
+          "Fetch with POST with FormData body",
+          "Fetch with POST with URLSearchParams body",
+          "Fetch with POST with Blob body",
+          "Fetch with POST with ArrayBuffer body",
+          "Fetch with POST with Uint8Array body",
+          "Fetch with POST with Int8Array body",
+          "Fetch with POST with Float32Array body",
+          "Fetch with POST with Float64Array body",
+          "Fetch with POST with DataView body",
+          "Fetch with POST with Blob body with mime type",
+          "Fetch with Chicken",
+          "Fetch with Chicken with body",
+          "Fetch with POST and mode \"same-origin\" needs an Origin header",
+          "Fetch with POST and mode \"no-cors\" needs an Origin header",
+          "Fetch with PUT and mode \"same-origin\" needs an Origin header",
+          "Fetch with TacO and mode \"same-origin\" needs an Origin header",
+          "Fetch with TacO and mode \"cors\" needs an Origin header"
         ],
         "text-utf8.any.html": true,
         "accept-header.any.html": [