Skip to content
Permalink
Browse files

Editorial: use network and HTTP(S) scheme concepts

  • Loading branch information...
annevk committed May 30, 2016
1 parent 8669023 commit a7e7af28629938544d1b705225d04776261a2ff4
Showing with 15 additions and 19 deletions.
  1. +8 −10 Overview.html
  2. +7 −9 Overview.src.html
@@ -7,7 +7,7 @@

<p><a class="logo" href="https://whatwg.org/"><img alt="WHATWG" height="100" src="https://resources.whatwg.org/logo-fetch.svg" width="100"></a>
<h1 id="cors">Fetch</h1>
<h2 class="no-num no-toc" id="living-standard-—-last-updated-27-may-2016">Living Standard — Last Updated 27 May 2016</h2>
<h2 class="no-num no-toc" id="living-standard-—-last-updated-30-may-2016">Living Standard — Last Updated 30 May 2016</h2>

<dl>
<dt>Participate:
@@ -1417,9 +1417,8 @@ <h3 id="port-blocking"><span class="secno">3.5 </span>Port blocking</h3>
<li><p>If <var>scheme</var> is "<code title="">ftp</code>" and <var>port</var> is 20 or 21, then
return <b>allowed</b>.

<li><p>Otherwise, if <var>scheme</var> is "<code title="">ftp</code>", "<code title="">http</code>",
or "<code title="">https</code>", and <var>port</var> is a <a href="#bad-port">bad port</a>, then return
<b>blocked</b>.
<li><p>Otherwise, if <var>scheme</var> is a <a class="external" data-anolis-spec="url" href="https://url.spec.whatwg.org/#network-scheme">network scheme</a> and
<var>port</var> is a <a href="#bad-port">bad port</a>, then return <b>blocked</b>.

<li><p>Return <b>allowed</b>.
</ol>
@@ -2443,8 +2442,8 @@ <h3 id="main-fetch"><span class="secno">5.1 </span>Main fetch</h3>
<!-- file URLs end up here as they are not same-origin typically. -->

<dt><var>request</var>'s <a href="#concept-request-current-url" title="concept-request-current-url">current url</a>'s
<a class="external" data-anolis-spec="url" href="https://url.spec.whatwg.org/#concept-url-scheme" title="concept-url-scheme">scheme</a> is <em>not</em>
"<code title="">http</code>" or "<code title="">https</code>"
<a class="external" data-anolis-spec="url" href="https://url.spec.whatwg.org/#concept-url-scheme" title="concept-url-scheme">scheme</a> is <em>not</em> an
<a class="external" data-anolis-spec="url" href="https://url.spec.whatwg.org/#http-scheme">HTTP(S) scheme</a>

<dd><p>A <a href="#concept-network-error" title="concept-network-error">network error</a>.

@@ -2584,8 +2583,8 @@ <h3 id="main-fetch"><span class="secno">5.1 </span>Main fetch</h3>

<li>
<p>If <var>request</var>'s <a href="#concept-request-current-url" title="concept-request-current-url">current url</a>'s
<a class="external" data-anolis-spec="url" href="https://url.spec.whatwg.org/#concept-url-scheme" title="concept-url-scheme">scheme</a> is "<code title="">http</code>" or
"<code title="">https</code>", run these substeps:
<a class="external" data-anolis-spec="url" href="https://url.spec.whatwg.org/#concept-url-scheme" title="concept-url-scheme">scheme</a> is an
<a class="external" data-anolis-spec="url" href="https://url.spec.whatwg.org/#http-scheme">HTTP(S) scheme</a>, then run these substeps:

<ol>
<li><p>If <var>request</var>'s <a href="#concept-request-body" title="concept-request-body">body</a> is
@@ -2742,8 +2741,7 @@ <h3 id="basic-fetch"><span class="secno">5.2 </span>Basic fetch</h3>

<p class="XXX">Otherwise, … this scheme still needs to be defined.

<dt>"<code title="">http</code>"
<dt>"<code title="">https</code>"
<dt><a class="external" data-anolis-spec="url" href="https://url.spec.whatwg.org/#http-scheme">HTTP(S) scheme</a>
<dd>
<p>Return the result of performing an <a href="#concept-http-fetch" title="concept-http-fetch">HTTP fetch</a>
using <var>request</var>.
@@ -1345,9 +1345,8 @@ <h3>Port blocking</h3>
<li><p>If <var>scheme</var> is "<code title>ftp</code>" and <var>port</var> is 20 or 21, then
return <b>allowed</b>.

<li><p>Otherwise, if <var>scheme</var> is "<code title>ftp</code>", "<code title>http</code>",
or "<code title>https</code>", and <var>port</var> is a <span>bad port</span>, then return
<b>blocked</b>.
<li><p>Otherwise, if <var>scheme</var> is a <span data-anolis-spec=url>network scheme</span> and
<var>port</var> is a <span>bad port</span>, then return <b>blocked</b>.

<li><p>Return <b>allowed</b>.
</ol>
@@ -2371,8 +2370,8 @@ <h3>Main fetch</h3>
<!-- file URLs end up here as they are not same-origin typically. -->

<dt><var>request</var>'s <span title=concept-request-current-url>current url</span>'s
<span data-anolis-spec=url title=concept-url-scheme>scheme</span> is <em>not</em>
"<code title>http</code>" or "<code title>https</code>"
<span data-anolis-spec=url title=concept-url-scheme>scheme</span> is <em>not</em> an
<span data-anolis-spec=url>HTTP(S) scheme</span>

<dd><p>A <span title=concept-network-error>network error</span>.

@@ -2512,8 +2511,8 @@ <h3>Main fetch</h3>

<li>
<p>If <var>request</var>'s <span title=concept-request-current-url>current url</span>'s
<span data-anolis-spec=url title=concept-url-scheme>scheme</span> is "<code title>http</code>" or
"<code title>https</code>", run these substeps:
<span data-anolis-spec=url title=concept-url-scheme>scheme</span> is an
<span data-anolis-spec=url>HTTP(S) scheme</span>, then run these substeps:

<ol>
<li><p>If <var>request</var>'s <span title=concept-request-body>body</span> is
@@ -2670,8 +2669,7 @@ <h3>Basic fetch</h3>

<p class=XXX>Otherwise, &hellip; this scheme still needs to be defined.

<dt>"<code title>http</code>"
<dt>"<code title>https</code>"
<dt><span data-anolis-spec=url>HTTP(S) scheme</span>
<dd>
<p>Return the result of performing an <span title=concept-http-fetch>HTTP fetch</span>
using <var>request</var>.

0 comments on commit a7e7af2

Please sign in to comment.
You can’t perform that action at this time.