diff --git a/fetch.bs b/fetch.bs index a612c2145..13f484281 100644 --- a/fetch.bs +++ b/fetch.bs @@ -205,7 +205,7 @@ lt="authentication entry">authentication entries (for HTTP authentication).
ongoing
")
ongoing
", "terminated
", or "aborted
".
ter
A fetch params fetchParams is canceled if
its fetch state is "aborted
" or "terminated
".
-
A fetch controller is an object used to enable clients of an ongoing fetch
-to perform certain actions in the context of that fetch instance.
+
A fetch controller is a struct used to enable clients of an
+ongoing fetch to perform certain actions in the context of that fetch instance.
A fetch controller has an associated fetch params
-ongoing fetch params.
+internal fetch params.
To terminate a
fetch controller controller, terminate
-controller's ongoing fetch params.
+controller's internal fetch params.
To abort a fetch controller
controller, abort controller's
-ongoing fetch params.
+internal fetch params.
To queue a fetch task, given an algorithm algorithm, a
global object or a parallel queue taskDestination, run these
@@ -2083,9 +2083,15 @@ known as an aborted network error
body is always null.
To create the appropriate network error given fetch params
-fetchParams, return an aborted network error if fetchParams's
-fetch state is "aborted
"; otherwise return a
-network error.
+fetchParams:
+
+
+ Assert: fetchParams is canceled.
+
+ Return an aborted network error if fetchParams's
+ fetch state is "aborted
"; otherwise return a
+ network error.
+
@@ -2268,16 +2274,18 @@ functionality.
request).
A fetch record has an associated
-fetch (a
+controller (a
fetch controller or null).
When a fetch group is
terminated, for each associated
-fetch record whose request's done flag is
-unset or keepalive is false, terminate the
-fetch record's fetch.
+fetch record whose
+fetch record's controller is not null, and whose
+request's done flag is unset or keepalive is
+false, terminate the fetch record's
+controller.
Resolving domains
@@ -3784,7 +3792,7 @@ the request.
crossOriginIsolatedCapability.
Let controller be a new fetch controller with its
- ongoing fetch params set to fetchParams.
+ internal fetch params set to fetchParams.
If request's body is a byte sequence, then set
request's body to the first return value of
@@ -3859,8 +3867,9 @@ the request.
If request is a subresource request, then:
- Let record be a new fetch record consisting of
- request and controller.
+
Let record be a new fetch record whose
+ request is request and
+ controller is controller.
Append record to request's client's
fetch group list of fetch records.
@@ -5419,7 +5428,8 @@ optional boolean forceNewConnection (default false), run these steps:
Let pullAlgorithm be an action that resumes the
ongoing fetch if it is suspended.
-
Let cancelAlgorithm be to abort fetchParams.
+
Let cancelAlgorithm be an algorithm that
+ aborts fetchParams.
Let highWaterMark be a non-negative, non-NaN number, chosen by the user agent.