W3C home > Mailing lists > Public > public-html-commits@w3.org > December 2009

html5/websockets Overview.html,1.134,1.135

From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
Date: Mon, 07 Dec 2009 10:23:22 +0000
To: public-html-commits@w3.org
Message-Id: <E1NHakU-0000oA-M2@lionel-hutz.w3.org>
Update of /sources/public/html5/websockets
In directory hutz:/tmp/cvs-serv3092

Modified Files:
	Overview.html 
Log Message:
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. (whatwg r4412)

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/websockets/Overview.html,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- Overview.html	7 Dec 2009 08:05:04 -0000	1.134
+++ Overview.html	7 Dec 2009 10:23:20 -0000	1.135
@@ -345,9 +345,9 @@
   constructor takes one or two arguments. The first argument, <var 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>When the <code>WebSocket()</code> constructor is invoked, the UA
+  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>When the <code>WebSocket()</code> constructor is invoked, the UA
   must run these steps:<ol><!-- beware, this is very similar to the steps for what happens
    during a redirect, in the protocol section --><li><p><span>Parse a Web Socket URL's components</span> from the
    <var title="">url</var> argument, to obtain <var title="">host</var>, <var title="">port</var>, <var title="">resource name</var>, and <var title="">secure</var>. If
@@ -362,11 +362,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.</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.</li>
 
    <li><p>Let <var title="">origin</var> be the <span title="ASCII
    serialization of an origin">ASCII serialization</span> of the
Received on Monday, 7 December 2009 10:23:24 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Monday, 7 December 2009 10:23:25 GMT