Skip to content

Commit 086e35f

Browse files
authored
Account for removal of AbortSignal's follow
See whatwg/dom#1152 for context. Tests: web-platform-tests/wpt#39951. SW PR: w3c/ServiceWorker#1678.
1 parent 018ac19 commit 086e35f

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

fetch.bs

+16-13
Original file line numberDiff line numberDiff line change
@@ -7542,8 +7542,8 @@ object), initially null.
75427542

75437543
<div algorithm>
75447544
<p>To <dfn export for=Request lt=create|creating>create</dfn> a {{Request}} object, given a
7545-
<a for=/>request</a> <var>request</var>, <a for=/>headers guard</a> <var>guard</var>, and
7546-
<a>realm</a> <var>realm</var>, run these steps:
7545+
<a for=/>request</a> <var>request</var>, <a for=/>headers guard</a> <var>guard</var>,
7546+
{{AbortSignal}} object <var>signal</var>, and <a>realm</a> <var>realm</var>:
75477547

75487548
<ol>
75497549
<li><p>Let <var>requestObject</var> be a <a for=/>new</a> {{Request}} object with <var>realm</var>.
@@ -7554,8 +7554,7 @@ object), initially null.
75547554
object with <var>realm</var>, whose <a for=Headers>headers list</a> is <var>request</var>'s
75557555
<a for=request>headers list</a> and <a for=Headers>guard</a> is <var>guard</var>.
75567556

7557-
<li><p>Set <var>requestObject</var>'s <a for=Request>signal</a> to a <a for=/>new</a>
7558-
{{AbortSignal}} object with <var>realm</var>.
7557+
<li><p>Set <var>requestObject</var>'s <a for=Request>signal</a> to <var>signal</var>.
75597558

75607559
<li><p>Return <var>requestObject</var>.
75617560
</ol>
@@ -7826,11 +7825,12 @@ constructor steps are:
78267825

78277826
<li><p>Set <a>this</a>'s <a for=Request>request</a> to <var>request</var>.
78287827

7829-
<li><p>Set <a>this</a>'s <a for=Request>signal</a> to a <a for=/>new</a> {{AbortSignal}} object
7830-
with <a>this</a>'s <a>relevant realm</a>.
7828+
<li><p>Let <var>signals</var> be « <var>signal</var> » if <var>signal</var> is non-null; otherwise
7829+
« ».
78317830

7832-
<li><p>If <var>signal</var> is non-null, then make <a>this</a>'s <a for=Request>signal</a>
7833-
<a for=AbortSignal>follow</a> <var>signal</var>.
7831+
<li><p>Set <a>this</a>'s <a for=Request>signal</a> to the result of
7832+
<a>creating a dependent abort signal</a> from <var>signals</var>, using {{AbortSignal}} and
7833+
<a>this</a>'s <a>relevant realm</a>.
78347834

78357835
<li><p>Set <a>this</a>'s <a for=Request>headers</a> to a <a for=/>new</a> {{Headers}} object with
78367836
<a>this</a>'s <a>relevant realm</a>, whose <a for=Headers>header list</a> is <var>request</var>'s
@@ -8015,12 +8015,15 @@ set; otherwise false.
80158015
<li><p>Let <var>clonedRequest</var> be the result of <a lt=clone for=request>cloning</a>
80168016
<a>this</a>'s <a for=Request>request</a>.
80178017

8018-
<li><p>Let <var>clonedRequestObject</var> be the result of <a for=Request>creating</a> a
8019-
{{Request}} object, given <var>clonedRequest</var>, <a>this</a>'s
8020-
<a for=Request>headers</a>'s <a for=Headers>guard</a>, and <a>this</a>'s <a>relevant realm</a>.
8018+
<li><p><a for=/>Assert</a>: <a>this</a>'s <a for=Request>signal</a> is non-null.
80218019

8022-
<li><p>Make <var>clonedRequestObject</var>'s <a for=Request>signal</a>
8023-
<a for=AbortSignal>follow</a> <a>this</a>'s <a for=Request>signal</a>.
8020+
<li><p>Let <var>clonedSignal</var> be the result of <a>creating a dependent abort signal</a> from
8021+
« <a>this</a>'s <a for=Request>signal</a> », using {{AbortSignal}} and <a>this</a>'s
8022+
<a>relevant realm</a>.
8023+
8024+
<li><p>Let <var>clonedRequestObject</var> be the result of <a for=Request>creating</a> a
8025+
{{Request}} object, given <var>clonedRequest</var>, <a>this</a>'s <a for=Request>headers</a>'s
8026+
<a for=Headers>guard</a>, <var>clonedSignal</var> and <a>this</a>'s <a>relevant realm</a>.
80248027

80258028
<li><p>Return <var>clonedRequestObject</var>.
80268029
</ol>

0 commit comments

Comments
 (0)