@@ -5063,9 +5063,7 @@ these steps:
5063
5063
<ol>
5064
5064
<li><p> Let <var> request</var> be <var> fetchParams</var> 's <a for="fetch params">request</a> .
5065
5065
5066
- <li><p> Let <var> response</var> be null.
5067
-
5068
- <li><p> Let <var> actualResponse</var> be null.
5066
+ <li><p> Let <var> response</var> and <var> internalResponse</var> be null.
5069
5067
5070
5068
<li>
5071
5069
<p> If <var> request</var> 's <a>service-workers mode</a> is "<code> all</code> ", then:
@@ -5126,9 +5124,9 @@ these steps:
5126
5124
<li> If <var> request</var> 's <a for=request>body</a> is non-null, then
5127
5125
<a for=ReadableStream>cancel</a> <var> request</var> 's <a for=request>body</a> with undefined.
5128
5126
5129
- <li><p> Set <var> actualResponse </var> to <var> response</var> , if <var> response</var> is not a
5130
- <a>filtered response</a> , and to <var> response</var> 's
5131
- <a for="filtered response">internal response</a> otherwise .
5127
+ <li><p> Set <var> internalResponse </var> to <var> response</var> , if <var> response</var> is not a
5128
+ <a>filtered response</a> ; otherwise to <var> response</var> 's
5129
+ <a for="filtered response">internal response</a> .
5132
5130
5133
5131
<li>
5134
5132
<p> If one of the following is true
@@ -5194,7 +5192,7 @@ these steps:
5194
5192
<p class=note> Redirects coming from the network (as opposed to from a service worker) are not to
5195
5193
be exposed to a service worker.
5196
5194
5197
- <li><p> Set <var> response</var> and <var> actualResponse </var> to the result of running
5195
+ <li><p> Set <var> response</var> and <var> internalResponse </var> to the result of running
5198
5196
<a>HTTP-network-or-cache fetch</a> given <var> fetchParams</var> .
5199
5197
5200
5198
<li>
@@ -5215,20 +5213,20 @@ these steps:
5215
5213
<a for=response>type</a> is "<code> opaque</code> ", and the
5216
5214
<a>cross-origin resource policy check</a> with <var> request</var> 's <a for=request>origin</a> ,
5217
5215
<var> request</var> 's <a for=request>client</a>, <var>request</var>' s
5218
- <a for=request>destination</a> , and <var> actualResponse </var> returns <b> blocked</b> , then return
5219
- a <a>network error</a> .
5216
+ <a for=request>destination</a> , and <var> internalResponse </var> returns <b> blocked</b> , then
5217
+ return a <a>network error</a> .
5220
5218
5221
5219
<p class=note> The <a>cross-origin resource policy check</a> runs for responses coming from the
5222
5220
network and responses coming from the service worker. This is different from the
5223
5221
<a>CORS check</a> , as <var> request</var> 's <a for=request>client</a> and the service worker can
5224
5222
have different embedder policies.
5225
5223
5226
5224
<li>
5227
- <p> If <var> actualResponse </var> 's <a for=response>status</a> is a <a>redirect status</a> , then :
5225
+ <p> If <var> internalResponse </var> 's <a for=response>status</a> is a <a>redirect status</a> :
5228
5226
5229
5227
<ol>
5230
5228
<li>
5231
- <p> If <var> actualResponse </var> 's <a for=response>status</a> is not 303, <var>request</var>' s
5229
+ <p> If <var> internalResponse </var> 's <a for=response>status</a> is not 303, <var>request</var>' s
5232
5230
<a for=request>body</a> is non-null, and the <a>connection</a> uses HTTP/2, then user agents
5233
5231
may, and are even encouraged to, transmit an <code> RST_STREAM</code> frame.
5234
5232
@@ -5252,18 +5250,18 @@ these steps:
5252
5250
given <var> fetchParams</var> and <var> response</var> .
5253
5251
5254
5252
<li><p> Otherwise, set <var> response</var> to an <a>opaque-redirect filtered response</a>
5255
- whose <a for="filtered response">internal response</a> is <var> actualResponse </var> .
5253
+ whose <a for="filtered response">internal response</a> is <var> internalResponse </var> .
5256
5254
</ol>
5257
5255
5258
5256
<dt> "<code> follow</code> "
5259
5257
<dd>
5260
5258
<ol><li><p> Set <var> response</var> to the result of running <a>HTTP-redirect fetch</a> given
5261
5259
<var> fetchParams</var> and <var> response</var> .</ol>
5262
5260
</dl>
5263
- <!-- not resetting actualResponse since it's no longer used anyway -->
5261
+ <!-- not resetting internalResponse since it's no longer used anyway -->
5264
5262
</ol>
5265
5263
5266
- <li><p> Return <var> response</var> . <span class=note> Typically <var> actualResponse </var> 's
5264
+ <li><p> Return <var> response</var> . <span class=note> Typically <var> internalResponse </var> 's
5267
5265
<a for=response>body</a> 's <a for=body>stream</a> is still being enqueued to after
5268
5266
returning.</span>
5269
5267
</ol>
@@ -5280,11 +5278,11 @@ run these steps:
5280
5278
<ol>
5281
5279
<li><p> Let <var> request</var> be <var> fetchParams</var> 's <a for="fetch params">request</a> .
5282
5280
5283
- <li><p> Let <var> actualResponse </var> be <var> response</var> , if <var> response</var> is not a
5284
- <a>filtered response</a> , and <var> response</var> 's
5285
- <a for="filtered response">internal response</a> otherwise .
5281
+ <li><p> Let <var> internalResponse </var> be <var> response</var> , if <var> response</var> is not a
5282
+ <a>filtered response</a> ; otherwise <var> response</var> 's
5283
+ <a for="filtered response">internal response</a> .
5286
5284
5287
- <li><p> Let <var> locationURL</var> be <var> actualResponse </var> 's <a for=response>location URL</a>
5285
+ <li><p> Let <var> locationURL</var> be <var> internalResponse </var> 's <a for=response>location URL</a>
5288
5286
given <var> request</var> 's <a for=request>current URL</a>' s <a for=url>fragment</a> .
5289
5287
5290
5288
<li><p> If <var> locationURL</var> is null, then return <var> response</var> .
@@ -5310,17 +5308,17 @@ run these steps:
5310
5308
5311
5309
<p class=note> This catches a cross-origin resource redirecting to a same-origin URL.
5312
5310
5313
- <li><p> If <var> actualResponse </var> 's <a for=response>status</a> is not 303, <var>request</var>' s
5311
+ <li><p> If <var> internalResponse </var> 's <a for=response>status</a> is not 303, <var>request</var>' s
5314
5312
<a for=request>body</a> is non-null, and <var> request</var> 's <a for=request>body</a>' s
5315
5313
<a for=body>source</a> is null, then return a <a>network error</a> .
5316
5314
5317
5315
<li>
5318
5316
<p> If one of the following is true
5319
5317
5320
5318
<ul class=brief>
5321
- <li><p><var> actualResponse </var> 's <a for=response>status</a> is 301 or 302 and
5319
+ <li><p><var> internalResponse </var> 's <a for=response>status</a> is 301 or 302 and
5322
5320
<var> request</var> 's <a for=request>method</a> is `<code> POST</code> `
5323
- <li><p><var> actualResponse </var> 's <a for=response>status</a> is 303 and <var>request</var>' s
5321
+ <li><p><var> internalResponse </var> 's <a for=response>status</a> is 303 and <var>request</var>' s
5324
5322
<a for=request>method</a> is not `<code> GET</code> ` or `<code> HEAD</code> `
5325
5323
</ul>
5326
5324
@@ -5369,7 +5367,7 @@ run these steps:
5369
5367
<a for=request>URL list</a> .
5370
5368
5371
5369
<li><p> Invoke <a>set <var>request</var>'s referrer policy on redirect</a> on <var> request</var> and
5372
- <var> actualResponse </var> . [[!REFERRER]]
5370
+ <var> internalResponse </var> . [[!REFERRER]]
5373
5371
5374
5372
<li><p> Let <var> recursive</var> be true.
5375
5373
0 commit comments