[html5] r5053 - [t] (0) Clarify that the Origin must always be lowercase.

[whatwg at whatwg.org]

Author: ianh
Date: 2010-04-14 18:06:05 -0700 (Wed, 14 Apr 2010)
New Revision: 5053

Modified:
   complete.html
   source
Log:
[t] (0) Clarify that the Origin must always be lowercase.

Modified: complete.html
===================================================================
--- complete.html	2010-04-15 01:00:32 UTC (rev 5052)
+++ complete.html	2010-04-15 01:06:05 UTC (rev 5053)
@@ -69595,11 +69595,12 @@
   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>
 
@@ -69753,8 +69754,7 @@
    <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>
 
@@ -70199,9 +70199,8 @@
 
      <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>
@@ -70833,10 +70832,10 @@
 
      <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>
 

Modified: source
===================================================================
--- source	2010-04-15 01:00:32 UTC (rev 5052)
+++ source	2010-04-15 01:06:05 UTC (rev 5053)
@@ -78093,11 +78093,14 @@
   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>
 
@@ -78267,8 +78270,7 @@
 
     <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>
 
@@ -78762,9 +78764,9 @@
      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
@@ -79487,10 +79489,11 @@
 
      <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>