Skip to content

Commit 6291752

Browse files
authored
Remove HTTP cache talk in HTTP-network fetch
This was overlooked in cbca2c2 and is already handled by HTTP-network-or-cache fetch. Also remove the "abort when" wrapper as this can all be done synchronously. If the fetch is canceled it's caught immediately after. And finally use the tracking-vector feature instead of a note.
1 parent a388348 commit 6291752

File tree

1 file changed

+11
-42
lines changed

1 file changed

+11
-42
lines changed

fetch.bs

Lines changed: 11 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -5529,12 +5529,6 @@ optional boolean <var>forceNewConnection</var> (default false), run these steps:
55295529

55305530
<li><p>Let <var>timingInfo</var> be <var>fetchParams</var>'s <a for="fetch params">timing info</a>.
55315531

5532-
<li><p>Let <var>httpCache</var> be the result of <a>determining the HTTP cache partition</a>, given
5533-
<var>request</var>.
5534-
5535-
<li><p>If <var>httpCache</var> is null, then set <var>request</var>'s <a for=request>cache mode</a>
5536-
to "<code>no-store</code>".
5537-
55385532
<li><p>Let <var>networkPartitionKey</var> be the result of
55395533
<a for=request>determining the network partition key</a> given <var>request</var>.
55405534

@@ -5756,42 +5750,17 @@ optional boolean <var>forceNewConnection</var> (default false), run these steps:
57565750
<a for="ReadableStream/set up"><var>highWaterMark</var></a> set to <var>highWaterMark</var>, and
57575751
<a for="ReadableStream/set up"><var>sizeAlgorithm</var></a> set to <var>sizeAlgorithm</var>.
57585752

5759-
<li>
5760-
<p>Run these steps, but <a>abort when</a> <var>fetchParams</var> is
5761-
<a for="fetch params">canceled</a>:
5762-
5763-
<ol>
5764-
<li><p>Set <var>response</var>'s <a for=response>body</a> to a new
5765-
<a for=/>body</a> whose <a for=body>stream</a> is
5766-
<var>stream</var>.
5767-
5768-
<li><p>If <var>response</var> is not a <a>network error</a> and <var>request</var>'s
5769-
<a for=request>cache mode</a> is not "<code>no-store</code>", then update <var>response</var> in
5770-
<var>httpCache</var> for <var>request</var>.
5771-
5772-
<li>
5773-
<p>If <var>includeCredentials</var> is true and the user agent is not configured to block
5774-
cookies for <var>request</var> (see
5775-
<a href=https://datatracker.ietf.org/doc/html/rfc6265#section-7>section 7</a> of [[!COOKIES]]),
5776-
then run the "set-cookie-string" parsing algorithm (see
5777-
<a href=https://datatracker.ietf.org/doc/html/rfc6265#section-5.2>section 5.2</a> of
5778-
[[!COOKIES]]) on the <a for=header>value</a> of each <var>header</var> whose
5779-
<a for=header>name</a> is a <a>byte-case-insensitive</a> match for `<code>Set-Cookie</code>` in
5780-
<var>response</var>'s <a for=response>header list</a>, if any, and <var>request</var>'s
5781-
<a for=request>current URL</a>.
5782-
5783-
<p class=note>This is a fingerprinting vector.
5784-
</ol>
5785-
5786-
<li>
5787-
<p><a>If aborted</a>, then:
5788-
5789-
<ol>
5790-
<li><p>If <var>fetchParams</var> is <a for="fetch params">aborted</a>, then set
5791-
<var>response</var>'s <a for=response>aborted flag</a>.
5792-
5793-
<li><p>Return <var>response</var>.
5794-
</ol>
5753+
<li><p>Set <var>response</var>'s <a for=response>body</a> to a new <a for=/>body</a> whose
5754+
<a for=body>stream</a> is <var>stream</var>.
5755+
5756+
<li><p tracking-vector>If <var>includeCredentials</var> is true and the user agent is not
5757+
configured to block cookies for <var>request</var> (see
5758+
<a href=https://datatracker.ietf.org/doc/html/rfc6265#section-7>section 7</a> of [[!COOKIES]]),
5759+
then run the "set-cookie-string" parsing algorithm (see
5760+
<a href=https://datatracker.ietf.org/doc/html/rfc6265#section-5.2>section 5.2</a> of [[!COOKIES]])
5761+
on the <a for=header>value</a> of each <var>header</var> whose <a for=header>name</a> is a
5762+
<a>byte-case-insensitive</a> match for `<code>Set-Cookie</code>` in <var>response</var>'s
5763+
<a for=response>header list</a>, if any, and <var>request</var>'s <a for=request>current URL</a>.
57955764

57965765
<li>
57975766
<p>Run these steps <a>in parallel</a>:

0 commit comments

Comments
 (0)