[html5] r6269 - [giow] (0) Prevent API from sending too much data to the protocol for the close [...]

[whatwg at whatwg.org]

Author: ianh
Date: 2011-06-21 15:54:24 -0700 (Tue, 21 Jun 2011)
New Revision: 6269

Modified:
   complete.html
   source
Log:
[giow] (0) Prevent API from sending too much data to the protocol for the close frame.
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=12914

Modified: complete.html
===================================================================
--- complete.html	2011-06-21 22:42:03 UTC (rev 6268)
+++ complete.html	2011-06-21 22:54:24 UTC (rev 6269)
@@ -79800,6 +79800,11 @@
    <code><a href=#invalid_access_err>INVALID_ACCESS_ERR</a></code> exception and abort these
    steps.</li>
 
+   <li><p>If the method's second argument is present, then let <var title="">reason</var> be the result of encoding that argument as
+   UTF-8. If <var title="">reason</var> is longer than 123 bytes, then
+   throw an <code><a href=#syntax_err>SYNTAX_ERR</a></code> exception and abort these steps.
+   <a href=#refsRFC3629>[RFC3629]</a></li>
+
    <li><p>Run the first matching steps from the following list:</p>
 
     <dl class=switch><dt>If the <code title=dom-WebSocket-readyState><a href=#dom-websocket-readystate>readyState</a></code>
@@ -79846,9 +79851,8 @@
       code<!--CLOSE CODE--> to use in the WebSocket Close message must
       be the integer given by the first argument. <a href=#refsWSP>[WSP]</a></p>
 
-      <p>If the second argument is also present, then it must be
-      encoded as UTF-8 and provided in the Close message after the
-      status code<!--CLOSE CODE-->. <a href=#refsRFC3629>[RFC3629]</a> <a href=#refsWSP>[WSP]</a></p>
+      <p>If the second argument is also present, then <var title="">reason</var> must be provided in the Close message
+      after the status code<!--CLOSE CODE-->. <a href=#refsRFC3629>[RFC3629]</a> <a href=#refsWSP>[WSP]</a></p>
 
       <p class=note>The <i><a href=#start-the-websocket-closing-handshake>start the WebSocket closing handshake</a></i>
       algorithm eventually invokes the <i><a href=#close-the-websocket-connection>close the WebSocket

Modified: source
===================================================================
--- source	2011-06-21 22:42:03 UTC (rev 6268)
+++ source	2011-06-21 22:54:24 UTC (rev 6269)
@@ -90462,6 +90462,12 @@
    <code>INVALID_ACCESS_ERR</code> exception and abort these
    steps.</p></li>
 
+   <li><p>If the method's second argument is present, then let <var
+   title="">reason</var> be the result of encoding that argument as
+   UTF-8. If <var title="">reason</var> is longer than 123 bytes, then
+   throw an <code>SYNTAX_ERR</code> exception and abort these steps.
+   <a href="#refsRFC3629">[RFC3629]</a></p></li>
+
    <li><p>Run the first matching steps from the following list:</p>
 
     <dl class="switch">
@@ -90521,10 +90527,11 @@
       be the integer given by the first argument. <a
       href="#refsWSP">[WSP]</a></p>
 
-      <p>If the second argument is also present, then it must be
-      encoded as UTF-8 and provided in the Close message after the
-      status code<!--CLOSE CODE-->. <a
-      href="#refsRFC3629">[RFC3629]</a> <a href="#refsWSP">[WSP]</a></p>
+      <p>If the second argument is also present, then <var
+      title="">reason</var> must be provided in the Close message
+      after the status code<!--CLOSE CODE-->. <a
+      href="#refsRFC3629">[RFC3629]</a> <a
+      href="#refsWSP">[WSP]</a></p>
 
       <p class="note">The <i>start the WebSocket closing handshake</i>
       algorithm eventually invokes the <i>close the WebSocket