Skip to content

Commit

Permalink
Move credentials out of network or cache fetch since it ties in with …
Browse files Browse the repository at this point in the history 
…CORS https://www.w3.org/Bugs/Public/show_bug.cgi?id=26769
  • Loading branch information
@annevk
annevk committed Sep 10, 2014
1 parent f5ecd97 commit 9014f52
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 46 deletions.
46 changes: 22 additions & 24 deletions Overview.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<p><a class="logo" href="//www.whatwg.org/"><img alt="WHATWG" height="100" src="//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-9-september-2014">Living Standard — Last Updated 9 September 2014</h2>
<h2 class="no-num no-toc" id="living-standard-—-last-updated-10-september-2014">Living Standard — Last Updated 10 September 2014</h2>

<dl>
<dt>This Version:
Expand All @@ -34,7 +34,7 @@ <h2 class="no-num no-toc" id="living-standard-—-last-updated-9-september-2014"
<p class="copyright"><a href="http://creativecommons.org/publicdomain/zero/1.0/" rel="license"><img alt="CC0" src="http://i.creativecommons.org/p/zero/1.0/80x15.png"></a>
To the extent possible under law, the editor has waived all copyright and
related or neighboring rights to this work. In addition, as of
9 September 2014, the editor has made this specification available
10 September 2014, the editor has made this specification available
under the
<a href="http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0" rel="license">Open Web Foundation Agreement Version 1.0</a>,
which is available at
Expand Down Expand Up @@ -1393,13 +1393,6 @@ <h3 id="http-fetch"><span class="secno">4.2 </span>HTTP fetch</h3>
<p>If <var title="">response</var> is null, run these substeps:

<ol>
<li>
<p>Set <var title="">request</var>'s <a href="#skip-service-worker-flag">skip service worker flag</a>.

<p class="note no-backref">There might be redirects. Alternatively,
<var title="">request</var>'s <a href="#authentication-flag">authentication flag</a> is set and the
<i title="">CORS flag</i> is unset.

<li>
<p>If the <i title="">CORS preflight flag</i> is set and

Expand Down Expand Up @@ -1432,9 +1425,24 @@ <h3 id="http-fetch"><span class="secno">4.2 </span>HTTP fetch</h3>
<var title="">response</var>.
</ol>

<li>
<p>Set <var title="">request</var>'s <a href="#skip-service-worker-flag">skip service worker flag</a>.

<p class="note no-backref">There might be redirects. Alternatively,
<var title="">request</var>'s <a href="#authentication-flag">authentication flag</a> is set and the
<i title="">CORS flag</i> is unset.

<li><p>Let <var title="">credentials flag</var> be set if either
<var title="">HTTPRequest</var>'s
<a href="#concept-request-credentials-mode" title="concept-request-credentials-mode">credentials mode</a> is
<i title="">include</i>, or <var title="">HTTPRequest</var>'s
<a href="#concept-request-credentials-mode" title="concept-request-credentials-mode">credentials mode</a> is
<i title="">same-origin</i> and the <i title="">CORS flag</i> is unset, and unset otherwise.

<li><p>Set <var title="">response</var> to the result of performing an
<a href="#concept-http-network-or-cache-fetch" title="concept-http-network-or-cache-fetch">HTTP network or cache fetch</a>
using <var title="">request</var> with <i title="">authentication fetch flag</i> if set.
using <var title="">request</var> with <var title="">credentials flag</var> if set and
<i title="">authentication fetch flag</i> if set.

<li>
<p>If the <i title="">CORS flag</i> is set and a
Expand Down Expand Up @@ -1600,10 +1608,11 @@ <h3 id="http-network-or-cache-fetch"><span class="secno">4.3 </span>HTTP network

<p>To perform a
<dfn id="concept-http-network-or-cache-fetch" title="concept-http-network-or-cache-fetch">HTTP network or cache fetch</dfn> using
<var title="">request</var> with an optional <i title="">authentication fetch flag</i>, run
these steps:
<var title="">request</var> with an optional <i title="">credentials flag</i> and
<i title="">authentication fetch flag</i>, run these steps:

<p class="note">The <i title="">authentication fetch flag</i> is still a bookkeeping detail.
The <i title="">credentials flag</i> is one too.

<ol>
<li>
Expand Down Expand Up @@ -1638,13 +1647,6 @@ <h3 id="http-network-or-cache-fetch"><span class="secno">4.3 </span>HTTP network
<a href="#concept-request-header-list" title="concept-request-header-list">header list</a>.
<!-- XXX concept-as-bytes -->

<li><p>Let <var title="">credentials flag</var> be set if either
<var title="">HTTPRequest</var>'s
<a href="#concept-request-credentials-mode" title="concept-request-credentials-mode">credentials mode</a> is
<i title="">include</i>, or <var title="">HTTPRequest</var>'s
<a href="#concept-request-credentials-mode" title="concept-request-credentials-mode">credentials mode</a> is
<i title="">same-origin</i> and the <i title="">CORS flag</i> is unset, and unset otherwise.

<li>
<p>If <var title="">credentials flag</var> is set, run these substeps:

Expand Down Expand Up @@ -1888,10 +1890,6 @@ <h3 id="cors-preflight-fetch"><span class="secno">4.4 </span>CORS preflight fetc
<li><p>Set <var title="">preflight</var>'s <a href="#concept-request-body" title="concept-request-body">body</a> to
null.

<li><p>Set <var title="">preflight</var>'s
<a href="#concept-request-credentials-mode" title="concept-request-credentials-mode">credentials mode</a> to
<i title="">omit</i>.

<li><p>Let <var title="">response</var> be the result of performing an
<a href="#concept-http-network-or-cache-fetch" title="concept-http-network-or-cache-fetch">HTTP network or cache fetch</a> using
<var title="">preflight</var>.
Expand Down Expand Up @@ -3276,7 +3274,7 @@ <h2 class="no-num" id="acknowledgments">Acknowledgments</h2>
Simon Pieters,
Sunava Dutta,
Surya Ismail,
Takeshi Yoshino,
吉野剛史 (Takeshi Yoshino),
Thomas Roessler,
保呂毅 (Tsuyoshi Horo),
Tyler Close,
Expand Down
42 changes: 20 additions & 22 deletions Overview.src.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1349,13 +1349,6 @@ <h3>HTTP fetch</h3>
<p>If <var title>response</var> is null, run these substeps:

<ol>
<li>
<p>Set <var title>request</var>'s <span>skip service worker flag</span>.

<p class="note no-backref">There might be redirects. Alternatively,
<var title>request</var>'s <span>authentication flag</span> is set and the
<i title>CORS flag</i> is unset.</span>

<li>
<p>If the <i title>CORS preflight flag</i> is set and

Expand Down Expand Up @@ -1388,9 +1381,24 @@ <h3>HTTP fetch</h3>
<var title>response</var>.
</ol>

<li>
<p>Set <var title>request</var>'s <span>skip service worker flag</span>.

<p class="note no-backref">There might be redirects. Alternatively,
<var title>request</var>'s <span>authentication flag</span> is set and the
<i title>CORS flag</i> is unset.</span>

<li><p>Let <var title>credentials flag</var> be set if either
<var title>HTTPRequest</var>'s
<span title=concept-request-credentials-mode>credentials mode</span> is
<i title>include</i>, or <var title>HTTPRequest</var>'s
<span title=concept-request-credentials-mode>credentials mode</span> is
<i title>same-origin</i> and the <i title>CORS flag</i> is unset, and unset otherwise.

<li><p>Set <var title>response</var> to the result of performing an
<span title=concept-http-network-or-cache-fetch>HTTP network or cache fetch</span>
using <var title>request</var> with <i title>authentication fetch flag</i> if set.
using <var title>request</var> with <var title>credentials flag</var> if set and
<i title>authentication fetch flag</i> if set.

<li>
<p>If the <i title>CORS flag</i> is set and a
Expand Down Expand Up @@ -1556,10 +1564,11 @@ <h3>HTTP network or cache fetch</h3>

<p>To perform a
<dfn title=concept-http-network-or-cache-fetch>HTTP network or cache fetch</dfn> using
<var title>request</var> with an optional <i title>authentication fetch flag</i>, run
these steps:
<var title>request</var> with an optional <i title>credentials flag</i> and
<i title>authentication fetch flag</i>, run these steps:

<p class=note>The <i title>authentication fetch flag</i> is still a bookkeeping detail.
The <i title>credentials flag</i> is one too.

<ol>
<li>
Expand Down Expand Up @@ -1594,13 +1603,6 @@ <h3>HTTP network or cache fetch</h3>
<span title=concept-request-header-list>header list</span>.
<!-- XXX concept-as-bytes -->

<li><p>Let <var title>credentials flag</var> be set if either
<var title>HTTPRequest</var>'s
<span title=concept-request-credentials-mode>credentials mode</span> is
<i title>include</i>, or <var title>HTTPRequest</var>'s
<span title=concept-request-credentials-mode>credentials mode</span> is
<i title>same-origin</i> and the <i title>CORS flag</i> is unset, and unset otherwise.

<li>
<p>If <var title>credentials flag</var> is set, run these substeps:

Expand Down Expand Up @@ -1844,10 +1846,6 @@ <h3>CORS preflight fetch</h3>
<li><p>Set <var title>preflight</var>'s <span title=concept-request-body>body</span> to
null.

<li><p>Set <var title>preflight</var>'s
<span title=concept-request-credentials-mode>credentials mode</span> to
<i title>omit</i>.

<li><p>Let <var title>response</var> be the result of performing an
<span title=concept-http-network-or-cache-fetch>HTTP network or cache fetch</span> using
<var title>preflight</var>.
Expand Down Expand Up @@ -3174,7 +3172,7 @@ <h2 class=no-num>Acknowledgments</h2>
Simon Pieters,
Sunava Dutta,
Surya Ismail,
Takeshi Yoshino,
吉野剛史 (Takeshi Yoshino),
Thomas Roessler,
保呂毅 (Tsuyoshi Horo),
Tyler Close,
Expand Down

0 comments on commit 9014f52

Please sign in to comment.