[html5] r6555 - [giow] (0) Align with WSP on the subprotocol syntax. Fixing http://www.w3.org/Bu [...]

[whatwg at whatwg.org]

Author: ianh
Date: 2011-09-19 15:31:55 -0700 (Mon, 19 Sep 2011)
New Revision: 6555

Modified:
   complete.html
   source
Log:
[giow] (0) Align with WSP on the subprotocol syntax.
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=13777

Modified: complete.html
===================================================================
--- complete.html	2011-09-14 22:36:51 UTC (rev 6554)
+++ complete.html	2011-09-19 22:31:55 UTC (rev 6555)
@@ -239,7 +239,7 @@
 
   <header class=head id=head><p><a class=logo href=http://www.whatwg.org/><img alt=WHATWG height=101 src=/images/logo width=101></a></p>
    <hgroup><h1>Web Applications 1.0</h1>
-    <h2 class="no-num no-toc">Living Standard — Last Updated 14 September 2011</h2>
+    <h2 class="no-num no-toc">Living Standard — Last Updated 19 September 2011</h2>
    </hgroup><dl><dt>Multiple-page version:</dt>
     <dd><a href=http://www.whatwg.org/specs/web-apps/current-work/complete/>http://www.whatwg.org/specs/web-apps/current-work/complete/</a></dd>
     <dt>One-page version:</dt>
@@ -80180,9 +80180,9 @@
   omitted, it is equivalent to the empty array. Each string in the
   array is a subprotocol name. The connection will only be established
   if the server reports that it has selected one of these
-  subprotocols. The subprotocol names must all be non-empty ASCII
-  strings with no control characters and no spaces in them (i.e. only
-  characters in the range U+0021 to U+007E).</p>
+  subprotocols. The subprotocol names must all be strings that match
+  the requirements for elements that comprise the value of <code title=http-sec-websocket-protocol>Sec-WebSocket-Protocol</code>
+  header fields as defined by the WebSocket protocol specification. <a href=#refsWSP>[WSP]</a></p>
 
   <p>When the <code>WebSocket()</code> constructor is invoked, the UA
   must run these steps:</p>
@@ -80224,10 +80224,11 @@
    </li>
 
    <li><p>If any of the values in <var title="">protocols</var> occur
-   more than once or contain characters with Unicode code points less
-   than U+0021 or greater than U+007E (i.e. the space character or any
-   characters that are not printable ASCII characters), then throw a
-   <code><a href=#syntax_err>SYNTAX_ERR</a></code> exception and abort these steps.</li>
+   more than once or otherwise fail to match the requirements for
+   elements that comprise the value of <code title=http-sec-websocket-protocol>Sec-WebSocket-Protocol</code>
+   header fields as defined by the WebSocket protocol specification,
+   then throw a <code><a href=#syntax_err>SYNTAX_ERR</a></code> exception and abort these
+   steps. <a href=#refsWSP>[WSP]</a></li>
 
    <li><p>Let <var title="">origin</var> be the <a href=#ascii-serialization-of-an-origin title="ASCII
    serialization of an origin">ASCII serialization</a> of the

Modified: source
===================================================================
--- source	2011-09-14 22:36:51 UTC (rev 6554)
+++ source	2011-09-19 22:31:55 UTC (rev 6555)
@@ -90727,9 +90727,11 @@
   omitted, it is equivalent to the empty array. Each string in the
   array is a subprotocol name. The connection will only be established
   if the server reports that it has selected one of these
-  subprotocols. The subprotocol names must all be non-empty ASCII
-  strings with no control characters and no spaces in them (i.e. only
-  characters in the range U+0021 to U+007E).</p>
+  subprotocols. The subprotocol names must all be strings that match
+  the requirements for elements that comprise the value of <code
+  title="http-sec-websocket-protocol">Sec-WebSocket-Protocol</code>
+  header fields as defined by the WebSocket protocol specification. <a
+  href="#refsWSP">[WSP]</a></p>
 
   <p>When the <code>WebSocket()</code> constructor is invoked, the UA
   must run these steps:</p>
@@ -90777,10 +90779,12 @@
    </li>
 
    <li><p>If any of the values in <var title="">protocols</var> occur
-   more than once or contain characters with Unicode code points less
-   than U+0021 or greater than U+007E (i.e. the space character or any
-   characters that are not printable ASCII characters), then throw a
-   <code>SYNTAX_ERR</code> exception and abort these steps.</p></li>
+   more than once or otherwise fail to match the requirements for
+   elements that comprise the value of <code
+   title="http-sec-websocket-protocol">Sec-WebSocket-Protocol</code>
+   header fields as defined by the WebSocket protocol specification,
+   then throw a <code>SYNTAX_ERR</code> exception and abort these
+   steps. <a href="#refsWSP">[WSP]</a></p></li>
 
    <li><p>Let <var title="">origin</var> be the <span title="ASCII
    serialization of an origin">ASCII serialization</span> of the