[html5] r4412 - [giow] (0) Continuing the theme of my being incompetent at editing this spec, he [...]

[whatwg at whatwg.org]

Author: ianh
Date: 2009-12-07 02:23:15 -0800 (Mon, 07 Dec 2009)
New Revision: 4412

Modified:
   complete.html
   source
Log:
[giow] (0) Continuing the theme of my being incompetent at editing this spec, here's a fix to put back the earlier reqirement that the WebSocket-Protocol string not be empty.

Modified: complete.html
===================================================================
--- complete.html	2009-12-07 08:04:59 UTC (rev 4411)
+++ complete.html	2009-12-07 10:23:15 UTC (rev 4412)
@@ -65330,9 +65330,9 @@
   constructor takes one or two arguments. The first argument, <var title="">url</var>, specifies the <a href=#url>URL</a> to which to
   connect. The second, <var title="">protocol</var>, if present,
   specifies a sub-protocol that the server must support for the
-  connection to be successful. The sub-protocol name must be an ASCII
-  string with no U+000A LINE FEED (LF) or U+000D CARRIAGE RETURN (CR)
-  characters in it.</p>
+  connection to be successful. The sub-protocol name must be a
+  non-empty ASCII string with no control characters in it (i.e. only
+  characters in the range U+0020 to U+007E).</p>
 
   <p>When the <code>WebSocket()</code> constructor is invoked, the UA
   must run these steps:</p>
@@ -65351,11 +65351,11 @@
     e.g. http://www.mozilla.org/projects/netlib/PortBanning.html
    -->
 
-   <li><p>If <var title="">protocol</var> is present but contains
-   characters with Unicode code points less than U+0020 or greater
-   than U+007E (i.e. 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>
+   <li><p>If <var title="">protocol</var> is present but is either the
+   empty string or contains characters with Unicode code points less
+   than U+0020 or greater than U+007E (i.e. 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>
 
    <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
@@ -65934,10 +65934,10 @@
   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 ASCII characters in the range U+0020 to U+007E. The
-  <var title="">resource name</var> string must additionally start
-  with a U+002F SOLIDUS character (/) and must not contain a U+0020
-  SPACE character. <a href=#refsORIGIN>[ORIGIN]</a></p>
+  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>
 

Modified: source
===================================================================
--- source	2009-12-07 08:04:59 UTC (rev 4411)
+++ source	2009-12-07 10:23:15 UTC (rev 4412)
@@ -74489,9 +74489,9 @@
   title="">url</var>, specifies the <span>URL</span> to which to
   connect. The second, <var title="">protocol</var>, if present,
   specifies a sub-protocol that the server must support for the
-  connection to be successful. The sub-protocol name must be an ASCII
-  string with no U+000A LINE FEED (LF) or U+000D CARRIAGE RETURN (CR)
-  characters in it.</p>
+  connection to be successful. The sub-protocol name must be a
+  non-empty ASCII string with no control characters in it (i.e. only
+  characters in the range U+0020 to U+007E).</p>
 
   <p>When the <code>WebSocket()</code> constructor is invoked, the UA
   must run these steps:</p>
@@ -74516,11 +74516,11 @@
     e.g. http://www.mozilla.org/projects/netlib/PortBanning.html
    -->
 
-   <li><p>If <var title="">protocol</var> is present but contains
-   characters with Unicode code points less than U+0020 or greater
-   than U+007E (i.e. any characters that are not printable ASCII
-   characters), then throw a <code>SYNTAX_ERR</code> exception and
-   abort these steps.</p></li>
+   <li><p>If <var title="">protocol</var> is present but is either the
+   empty string or contains characters with Unicode code points less
+   than U+0020 or greater than U+007E (i.e. any characters that are
+   not printable ASCII characters), then throw a
+   <code>SYNTAX_ERR</code> exception and abort these steps.</p></li>
 
    <li><p>Let <var title="">origin</var> be the <span title="ASCII
    serialization of an origin">ASCII serialization</span> of the
@@ -75220,10 +75220,10 @@
   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 ASCII characters in the range U+0020 to U+007E. The
-  <var title="">resource name</var> string must additionally start
-  with a U+002F SOLIDUS character (/) and must not contain a U+0020
-  SPACE character. <a href="#refsORIGIN">[ORIGIN]</a></p>
+  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>