Skip to content

Commit bb50b6e

Browse files
Address more comments
Address various comments from yoavweiss around phrasing, notes, and linking
1 parent d89c034 commit bb50b6e

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

fetch.bs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3268,20 +3268,21 @@ steps:
32683268

32693269
<ol>
32703270
<li>
3271-
<p>If one or more of the following conditions are met, return without modifying request:
3271+
<p>If one or more of the following conditions are met, return:
32723272
<ul>
32733273
<li><p><var>request</var>'s <a for="request">destination</a> is not "<code>document</code>"
32743274

32753275
<li><p><var>request</var>'s <a for="request">method</a> is not "<code>GET</code>"
32763276

3277-
<li><p><var>request</var>'s <a for="request">URL</a>'s <a for=url>scheme</a> is not
3277+
<li><p><var>request</var>'s <a for="request">URL</a>'s <a for="url">scheme</a> is not
32783278
"<code>http</code>"
32793279

3280-
<li><p><var>request</var>'s <a for="request">URL</a>'s <a for=url>host</a> is exempted from
3281-
upgrades in an <a>implementation-defined</a> way. For example, if <a for=url>host</a> is a
3282-
non-registrable or non-assignable domain name such as .local or an IP address that falls in a
3283-
range reserved for non-publicly routable networks, the implementation might return without
3284-
modifying <var>request</var>.
3280+
<li><p><var>request</var>'s <a for="request">URL</a>'s <a for="url">host</a> is exempted from
3281+
upgrades in an <a>implementation-defined</a> way.
3282+
3283+
<p class="example">If <a for=url>host</a> is a non-registrable or non-assignable domain name
3284+
such as .local or an IP address that falls in a range reserved for non-publicly routable
3285+
networks, the implementation might return without modifying <var>request</var>.
32853286
</ul>
32863287
</li>
32873288

@@ -3292,9 +3293,9 @@ steps:
32923293

32933294
<li><p>Otherwise, upgrade the request by setting the following fields:
32943295
<ul>
3295-
<li>Set <code>https-upgrade-fallback-url</code> to request's URL
3296-
<li>Set <var>request</var>'s URL's scheme to <code>"https"</code>
3297-
<li>Set <code>https-upgrade</code> flag to true
3296+
<li>Set <code>https-upgrade-fallback-url</code> to <var>request</var>'s <a for="request">URL</a>.
3297+
<li>Set <var>request</var>'s <a for="request">URL</a>'s <a for="url">scheme</a> to "<code>https</code>".
3298+
<li>Set <code>https-upgrade</code> flag to true.
32983299
</ul>
32993300
</li>
33003301
</ol>
@@ -3311,14 +3312,13 @@ To run <dfn>HTTPS upgrade fallback</dfn> given a <a for=/>request</a>
33113312
<p class="note">This means <var>request</var> was not upgraded.
33123313

33133314
<li>
3314-
<p>Otherwise, the request was upgraded.
3315-
3316-
<p>If <var>response</var> is a network error, the upgrade failed. Initiate a fallback
3317-
load by running the following steps:
3315+
<p class="note">The request was upgraded.
33183316

3317+
<p>If <var>response</var> is a network error, run the following steps:
3318+
<p class="note">This means that the upgrade failed and initiates a fallback load.
33193319
<ol>
3320-
<li><p>Create a synthetic redirect response <var>fallbackResponse</var> that redirects to
3321-
<var>request</var>'s <code>https-upgrade-fallback-url</code> flag with status 307.
3320+
<li><p>Let <var>fallbackResponse</var> be a new <a>Response</a> with its <code>Location</code> header set to
3321+
<code>https-upgrade-fallback-url</code>, and its <a for="response">status</a> set to 307.
33223322
<li>Return <var>fallbackResponse</var>.
33233323
</ol>
33243324

0 commit comments

Comments
 (0)