Skip to content

Commit

Permalink
[t] (0) Clarify that the Origin must always be lowercase.
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.whatwg.org/webapps@5053 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
Hixie committed Apr 15, 2010
1 parent 411777c commit aa994b0
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 28 deletions.
27 changes: 13 additions & 14 deletions complete.html
Original file line number Diff line number Diff line change
Expand Up @@ -69595,11 +69595,12 @@ <h6 id=opening-handshake-0><span class=secno>10.3.4.3.1 </span>Opening handshake
with a string giving a <var title="">protocol</var>, it must run the
following steps. The <var title="">host</var> must be ASCII-only
(i.e. it must have been punycode-encoded already if necessary). The
<var title="">resource name</var> and <var title="">protocol</var>
strings must be non-empty strings of ASCII characters in the range
U+0020 to U+007E. The <var title="">resource name</var> string must
start with a U+002F SOLIDUS character (/) and must not contain a
U+0020 SPACE character. <a href=#refsORIGIN>[ORIGIN]</a></p>
<var title="">origin</var> must not contain characters in the range
U+0041 to U+005A (i.e. LATIN CAPITAL LETTER A to LATIN CAPITAL
LETTER Z). The <var title="">resource name</var> and <var title="">protocol</var> strings must be non-empty strings of ASCII
characters in the range U+0020 to U+007E. The <var title="">resource
name</var> string must start with a U+002F SOLIDUS character (/) and
must not contain a U+0020 SPACE character. <a href=#refsORIGIN>[ORIGIN]</a></p>

<ol><li>

Expand Down Expand Up @@ -69753,8 +69754,7 @@ <h6 id=opening-handshake-0><span class=secno>10.3.4.3.1 </span>Opening handshake
<li>

<p>Add the string consisting of the concatenation of the string
"Origin:", a U+0020 SPACE character, and the <var title="">origin</var> value, <a href=#converted-to-ascii-lowercase>converted to ASCII
lowercase</a>, to <var title="">fields</var>.</p>
"Origin:", a U+0020 SPACE character, and the <var title="">origin</var> value, to <var title="">fields</var>.</p>

</li>

Expand Down Expand Up @@ -70199,9 +70199,8 @@ <h6 id=opening-handshake-0><span class=secno>10.3.4.3.1 </span>Opening handshake

<dt>If the entry's name is "<code title=http-sec-websocket-origin><a href=#sec-websocket-origin>sec-websocket-origin</a></code>"</dt>

<dd><p>If the value is not exactly equal to <var title="">origin</var>, <a href=#converted-to-ascii-lowercase>converted to ASCII lowercase</a>,
then <a href=#fail-the-websocket-connection>fail the WebSocket connection</a> and abort these
steps. <a href=#refsORIGIN>[ORIGIN]</a></dd>
<dd><p>If the value is not exactly equal to <var title="">origin</var>, then <a href=#fail-the-websocket-connection>fail the WebSocket
connection</a> and abort these steps. <a href=#refsORIGIN>[ORIGIN]</a></dd>


<dt>If the entry's name is "<code title=http-sec-websocket-location><a href=#sec-websocket-location>sec-websocket-location</a></code>"</dt>
Expand Down Expand Up @@ -70833,10 +70832,10 @@ <h6 id="sending-the-server's-opening-handshake"><span class=secno>10.3.4.4.2 </s

<dd>The <a href=#ascii-serialization-of-an-origin title="ASCII serialization of an origin">ASCII
serialization</a> of the origin that the server is willing to
communicate with. If the server can respond to requests from
multiple origins (or indeed, all origins), then the value should
be derived from the client's handshake, specifically from the
"<code title=http-origin>Origin</code>" field. <a href=#refsORIGIN>[ORIGIN]</a></dd>
communicate with, <a href=#converted-to-ascii-lowercase>converted to ASCII lowercase</a>. If
the server can respond to requests from multiple origins (or
indeed, all origins), then the value should be derived from the
client's handshake, specifically from the "<code title=http-origin>Origin</code>" field. <a href=#refsORIGIN>[ORIGIN]</a></dd>

<dt><var title="">subprotocol</var></dt>

Expand Down
31 changes: 17 additions & 14 deletions source
Original file line number Diff line number Diff line change
Expand Up @@ -78093,11 +78093,14 @@ Sec-WebSocket-Location: ws://example.com/</pre>
with a string giving a <var title="">protocol</var>, it must run the
following steps. The <var title="">host</var> must be ASCII-only
(i.e. it must have been punycode-encoded already if necessary). The
<var title="">resource name</var> and <var title="">protocol</var>
strings must be non-empty strings of ASCII characters in the range
U+0020 to U+007E. The <var title="">resource name</var> string must
start with a U+002F SOLIDUS character (/) and must not contain a
U+0020 SPACE character. <a href="#refsORIGIN">[ORIGIN]</a></p>
<var title="">origin</var> must not contain characters in the range
U+0041 to U+005A (i.e. LATIN CAPITAL LETTER A to LATIN CAPITAL
LETTER Z). The <var title="">resource name</var> and <var
title="">protocol</var> strings must be non-empty strings of ASCII
characters in the range U+0020 to U+007E. The <var title="">resource
name</var> string must start with a U+002F SOLIDUS character (/) and
must not contain a U+0020 SPACE character. <a
href="#refsORIGIN">[ORIGIN]</a></p>

<ol>

Expand Down Expand Up @@ -78267,8 +78270,7 @@ Proxy-authorization: Basic ZWRuYW1vZGU6bm9jYXBlcyE=</pre>

<p>Add the string consisting of the concatenation of the string
"Origin:", a U+0020 SPACE character, and the <var
title="">origin</var> value, <span>converted to ASCII
lowercase</span>, to <var title="">fields</var>.</p>
title="">origin</var> value, to <var title="">fields</var>.</p>

</li>

Expand Down Expand Up @@ -78762,9 +78764,9 @@ Proxy-authorization: Basic ZWRuYW1vZGU6bm9jYXBlcyE=</pre>
title="http-sec-websocket-origin">sec-websocket-origin</code>"</dt>

<dd><p>If the value is not exactly equal to <var
title="">origin</var>, <span>converted to ASCII lowercase</span>,
then <span>fail the WebSocket connection</span> and abort these
steps. <a href="#refsORIGIN">[ORIGIN]</a></p></dd>
title="">origin</var>, then <span>fail the WebSocket
connection</span> and abort these steps. <a
href="#refsORIGIN">[ORIGIN]</a></p></dd>


<dt>If the entry's name is "<code
Expand Down Expand Up @@ -79487,10 +79489,11 @@ multi-origin semantics described in [ORIGIN] applying. (http-origin)

<dd>The <span title="ASCII serialization of an origin">ASCII
serialization</span> of the origin that the server is willing to
communicate with. If the server can respond to requests from
multiple origins (or indeed, all origins), then the value should
be derived from the client's handshake, specifically from the
"<code title="http-origin">Origin</code>" field. <a
communicate with, <span>converted to ASCII lowercase</span>. If
the server can respond to requests from multiple origins (or
indeed, all origins), then the value should be derived from the
client's handshake, specifically from the "<code
title="http-origin">Origin</code>" field. <a
href="#refsORIGIN">[ORIGIN]</a></dd>

<dt><var title="">subprotocol</var></dt>
Expand Down

0 comments on commit aa994b0

Please sign in to comment.