Skip to content

Commit

Permalink
Address more comments
Browse files Browse the repository at this point in the history
Address various comments from yoavweiss around phrasing, notes, and linking
  • Loading branch information
christhompson committed Jul 7, 2023
1 parent d89c034 commit bb50b6e
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions fetch.bs
Original file line number Diff line number Diff line change
Expand Up @@ -3268,20 +3268,21 @@ steps:

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

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

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

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

<p class="example">If <a for=url>host</a> is a non-registrable or non-assignable domain name
such as .local or an IP address that falls in a range reserved for non-publicly routable
networks, the implementation might return without modifying <var>request</var>.
</ul>
</li>

Expand All @@ -3292,9 +3293,9 @@ steps:

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

<li>
<p>Otherwise, the request was upgraded.

<p>If <var>response</var> is a network error, the upgrade failed. Initiate a fallback
load by running the following steps:
<p class="note">The request was upgraded.

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

Expand Down

0 comments on commit bb50b6e

Please sign in to comment.