Skip to content

Commit 07886f6

Browse files
committed
Address annevk comments
1 parent ef08cf0 commit 07886f6

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

fetch.bs

+20-20
Original file line numberDiff line numberDiff line change
@@ -2162,7 +2162,7 @@ Unless stated otherwise, it is false.
21622162

21632163
<p class=note>This flag is for exclusive use by HTTPS Upgrading algorithm.
21642164

2165-
<p>A <a for=/>request</a> has an associated <dfn export for=request>HTTPS upgrade fallback URL</dfn>
2165+
<p>A <a for=/>request</a> has an associated <dfn export for=request>HTTPS upgrade fallback URL</dfn>,
21662166
which is a <a for=/>URL</a>. It is a copy of the <a for=/>request</a>'s original
21672167
<a for=request>URL</a> before <a for=/>request</a> is <a href="#https-upgrades-upgrade">optionally
21682168
upgraded to HTTPS</a>. Unless stated otherwise, it is unset.
@@ -3276,20 +3276,21 @@ through TLS using ALPN. The protocol cannot be spoofed through HTTP requests in
32763276
</ol>
32773277
</div>
32783278

3279+
32793280
<h3 id=https-upgrades>HTTPS upgrading</h3>
32803281

3281-
<p>User agents may optionally upgrade requests with URLs that are not <a>potentially trustworthy
3282-
URLs</a> to attempt to fetch them over <a>potentially trustworthy URLs</a>. If an upgraded request
3283-
fails with a network error, it is retried over the original URL.
3282+
<p>User agents may optionally upgrade requests with URLs that are not
3283+
<a>potentially trustworthy URLs</a> to attempt to fetch them over
3284+
<a>potentially trustworthy URLs</a>. If an upgraded request fails with a network error, it is
3285+
retried over the original URL.
32843286

32853287
<p>The HTTPS upgrading algorithm consists of <a>upgrade an HTTP request</a> and <a>HTTPS upgrade
32863288
fallback</a> algorithms.
32873289

32883290
<div algorithm>
32893291
<h4 id=https-upgrades-upgrade>HTTPS upgrade algorithm</h4>
32903292

3291-
<p>To <dfn>upgrade an HTTP request</dfn> given a <a for=/>request</a> <var>request</var>, run these
3292-
steps:
3293+
<p>To <dfn>upgrade an HTTP request</dfn> given a <a for=/>request</a> <var>request</var>:
32933294

32943295
<ol>
32953296
<li>
@@ -3319,7 +3320,8 @@ steps:
33193320

33203321
<p class=note>This is a fallback request that shouldn't be upgraded again.
33213322

3322-
<li><p>Otherwise, set the following fields:
3323+
<li>
3324+
<p>Otherwise, set the following fields:
33233325
<ul>
33243326
<li><p>Set <a for=request>HTTPS upgrade fallback URL</a> to <var>request</var>'s
33253327
<a for="request">URL</a>.
@@ -3337,7 +3339,7 @@ steps:
33373339
<h4 id=https-upgrades-fallback>Fallback algorithm</h4>
33383340

33393341
<p>To run <dfn>HTTPS upgrade fallback</dfn> given a <a for=/>request</a> <var>request</var> and
3340-
<a for=/>response</a> <var>response</var>, run these steps:
3342+
<a for=/>response</a> <var>response</var>:
33413343

33423344
<ol>
33433345
<li><p>If <var>request</var>'s <a for=request>is HTTPS upgrade</a> is not set, return
@@ -3355,13 +3357,11 @@ steps:
33553357
</ol>
33563358

33573359
<li>
3358-
<p>Return <var>response</var>.
3359-
<p class=note>This means the upgrade was successful.
3360+
<p>Return <var>response</var>.
3361+
<p class=note>This means the upgrade was successful.
33603362

33613363
</ol>
3362-
3363-
<p class=note>
3364-
User agents can implement a fast-fallback path by canceling slow fetches on upgraded
3364+
<p class=note>User agents can implement a fast-fallback path by canceling slow fetches on upgraded
33653365
requests, in order to quickly initiate a fallback http load.
33663366

33673367
</div>
@@ -4562,12 +4562,12 @@ steps:
45624562
<li><p><a>Upgrade <var>request</var> to a potentially trustworthy URL, if appropriate</a>.
45634563

45644564
<li>
4565-
<p>Optionally, run <a>upgrade an HTTP request</a> algorithm on <var>request</var>, if appropriate</a>.
4565+
<p>Optionally, run <a>upgrade an HTTP request</a> algorithm on <var>request</var>.
45664566

45674567
<p class=note>HTTPS upgrading only applies to requests with <a>HTTP(S) scheme</a>s, but it's done
4568-
in <a>main fetch</a> instead of <a>HTTP fetch</a> to ensure that <a>upgrade a mixed content
4569-
<var>request</var> to a potentially trustworthy URL, if appropriate</a> step runs next and applies
4570-
to the upgraded request.
4568+
in <a>main fetch</a> instead of <a>HTTP fetch</a> to ensure that
4569+
<a>upgrade a mixed content <var>request</var> to a potentially trustworthy URL, if appropriate</a>
4570+
step runs next and applies to the upgraded request.
45714571

45724572
<li><p><a>Upgrade a mixed content <var>request</var> to a potentially trustworthy URL, if appropriate</a>.
45734573

@@ -5277,7 +5277,7 @@ these steps:
52775277
<a>filtered response</a>; otherwise to <var>response</var>'s
52785278
<a for="filtered response">internal response</a>.
52795279

5280-
<li><p>If <var>response</var>'s <a for=response>type</a> is "<code>error</code>" then
5280+
<li><p>If <var>response</var>'s <a for=response>type</a> is "<code>error</code>", then
52815281
return the result of running <a>HTTPS upgrade fallback</a> given <var>request</var>
52825282
and a <a>network error</a>.
52835283

@@ -5373,8 +5373,8 @@ these steps:
53735373
have different embedder policies.
53745374

53755375
<li>If <var>request</var>'s <a for=request>is HTTPS upgrade</a> is set, set <var>response</var> and
5376-
<var>internalResponse</var> to the result of running
5377-
<a>HTTPS upgrade fallback</a> given <var>request</var> and <var>response</var>.
5376+
<var>internalResponse</var> to the result of running <a>HTTPS upgrade fallback</a> given
5377+
<var>request</var> and <var>response</var>.
53785378

53795379
<li>
53805380
<p>If <var>internalResponse</var>'s <a for=response>status</a> is a <a>redirect status</a>:

0 commit comments

Comments
 (0)