[html5] r6377 - [giow] (1) Make the client-side failure mode also fire 'error'. Fixing http://ww [...]

whatwg at whatwg.org whatwg at whatwg.org
Fri Aug 5 16:34:53 PDT 2011


Author: ianh
Date: 2011-08-05 16:34:52 -0700 (Fri, 05 Aug 2011)
New Revision: 6377

Modified:
   complete.html
   source
Log:
[giow] (1) Make the client-side failure mode also fire 'error'.
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=13294

Modified: complete.html
===================================================================
--- complete.html	2011-08-05 23:14:04 UTC (rev 6376)
+++ complete.html	2011-08-05 23:34:52 UTC (rev 6377)
@@ -80803,16 +80803,16 @@
 
     <p>If the <var title="">data</var> argument has any unpaired
     surrogates, then raise an <code><a href=#syntax_err>SYNTAX_ERR</a></code> exception. If
-    <i><a href=#the-websocket-connection-is-established>the WebSocket connection is established</a></i>, and the
-    string has no unpaired surrogates, and <i title="the WebSocket
-    closing handshake is started"><a href=#the-websocket-closing-handshake-is-started>the WebSocket closing handshake has
-    not yet started</a></i>, then the user agent must <i>send a WebSocket
+    <i><a href=#the-websocket-connection-is-established>the WebSocket connection is established</a></i>, and the string has
+    no unpaired surrogates, and <i title="the WebSocket closing
+    handshake is started"><a href=#the-websocket-closing-handshake-is-started>the WebSocket closing handshake has not yet
+    started</a></i>, then the user agent must <i>send a WebSocket
     Message</i> comprised of <var title="">data</var> using a text
     frame opcode; if the data cannot be sent, e.g. because it would
     need to be buffered but the buffer is full, the user agent must
-    <i><a href=#close-the-websocket-connection>close the WebSocket connection</a></i>. Any invokation of this
-    method with a string argument that does not raise an exception
-    must increase the <code title=dom-WebSocket-bufferedAmount><a href=#dom-websocket-bufferedamount>bufferedAmount</a></code>
+    <i><a href=#close-the-websocket-connection>close the WebSocket connection</a></i> <a href=#concept-websocket-close-fail title=concept-websocket-close-fail>with prejudice</a>. Any
+    invokation of this method with a string argument that does not
+    raise an exception must increase the <code title=dom-WebSocket-bufferedAmount><a href=#dom-websocket-bufferedamount>bufferedAmount</a></code>
     attribute by the number of bytes needed to express the argument as
     UTF-8. <a href=#refsRFC3629>[RFC3629]</a> <a href=#refsWSP>[WSP]</a></p>
 
@@ -80828,8 +80828,9 @@
     must <i>send a WebSocket Message</i> comprised of <var title="">data</var> using a binary frame opcode; if the data
     cannot be sent, e.g. because it would need to be buffered but the
     buffer is full, the user agent must <i><a href=#close-the-websocket-connection>close the WebSocket
-    connection</a></i>. The data to be sent is the raw data represented by
-    the <code><a href=#blob>Blob</a></code> object. <!-- that sentence is meant to
+    connection</a></i> <a href=#concept-websocket-close-fail title=concept-websocket-close-fail>with
+    prejudice</a>. The data to be sent is the raw data represented
+    by the <code><a href=#blob>Blob</a></code> object. <!-- that sentence is meant to
     invoke "This interface represents immutable raw data." --> Any
     invokation of this method with a <code><a href=#blob>Blob</a></code> argument that
     does not raise an exception must increase the <code title=dom-WebSocket-bufferedAmount><a href=#dom-websocket-bufferedamount>bufferedAmount</a></code>
@@ -80849,7 +80850,8 @@
     must <i>send a WebSocket Message</i> comprised of <var title="">data</var> using a binary frame opcode; if the data
     cannot be sent, e.g. because it would need to be buffered but the
     buffer is full, the user agent must <i><a href=#close-the-websocket-connection>close the WebSocket
-    connection</a></i>. The data to be sent is the data stored in the
+    connection</a></i> <a href=#concept-websocket-close-fail title=concept-websocket-close-fail>with
+    prejudice</a>. The data to be sent is the data stored in the
     buffer described by the <code>ArrayBuffer</code> object. <!-- that
     sentence is meant to invoke "The ArrayBuffer type describes a
     buffer used to store data for the array buffer views." at the top
@@ -80956,7 +80958,7 @@
   attribute's value will already be set to <code title=dom-WebSocket-CLOSING><a href=#dom-websocket-closing>CLOSING</a></code> (2) when this task
   runs.) <a href=#refsWSP>[WSP]</a></p>
 
-  <p id=closeWebSocket>When <i><a href=#the-websocket-connection-is-closed>the WebSocket connection is
+  <hr><p id=closeWebSocket>When <i><a href=#the-websocket-connection-is-closed>the WebSocket connection is
   closed</a></i>, possibly <i title="">cleanly</i>, the user agent must
   <a href=#queue-a-task>queue a task</a> to run the following substeps:</p>
 
@@ -80965,7 +80967,9 @@
    (3).</li>
 
    <li><p>If the user agent was required to <i><a href=#fail-the-websocket-connection>fail the websocket
-   connection</a></i>, <a href=#fire-a-simple-event>fire a simple event</a> named <code title="">error</code> at the <code><a href=#websocket>WebSocket</a></code> object. <a href=#refsWSP>[WSP]</a></li>
+   connection</a></i> or <i><a href=#the-websocket-connection-is-closed>the WebSocket connection is closed</a></i> <dfn id=concept-websocket-close-fail title=concept-websocket-close-fail>with prejudice</dfn>,
+   <a href=#fire-a-simple-event>fire a simple event</a> named <code title="">error</code>
+   at the <code><a href=#websocket>WebSocket</a></code> object. <a href=#refsWSP>[WSP]</a></li>
 
    <li><p>Create an event that uses the <code><a href=#closeevent>CloseEvent</a></code>
    interface, with the event name <code title=event-close>close</code>, which does not bubble, is not

Modified: source
===================================================================
--- source	2011-08-05 23:14:04 UTC (rev 6376)
+++ source	2011-08-05 23:34:52 UTC (rev 6377)
@@ -91483,16 +91483,17 @@
 
     <p>If the <var title="">data</var> argument has any unpaired
     surrogates, then raise an <code>SYNTAX_ERR</code> exception. If
-    <i>the WebSocket connection is established</i>, and the
-    string has no unpaired surrogates, and <i title="the WebSocket
-    closing handshake is started">the WebSocket closing handshake has
-    not yet started</i>, then the user agent must <i>send a WebSocket
+    <i>the WebSocket connection is established</i>, and the string has
+    no unpaired surrogates, and <i title="the WebSocket closing
+    handshake is started">the WebSocket closing handshake has not yet
+    started</i>, then the user agent must <i>send a WebSocket
     Message</i> comprised of <var title="">data</var> using a text
     frame opcode; if the data cannot be sent, e.g. because it would
     need to be buffered but the buffer is full, the user agent must
-    <i>close the WebSocket connection</i>. Any invokation of this
-    method with a string argument that does not raise an exception
-    must increase the <code
+    <i>close the WebSocket connection</i> <span
+    title="concept-websocket-close-fail">with prejudice</span>. Any
+    invokation of this method with a string argument that does not
+    raise an exception must increase the <code
     title="dom-WebSocket-bufferedAmount">bufferedAmount</code>
     attribute by the number of bytes needed to express the argument as
     UTF-8. <a href="#refsRFC3629">[RFC3629]</a> <a
@@ -91512,8 +91513,9 @@
     title="">data</var> using a binary frame opcode; if the data
     cannot be sent, e.g. because it would need to be buffered but the
     buffer is full, the user agent must <i>close the WebSocket
-    connection</i>. The data to be sent is the raw data represented by
-    the <code>Blob</code> object. <!-- that sentence is meant to
+    connection</i> <span title="concept-websocket-close-fail">with
+    prejudice</span>. The data to be sent is the raw data represented
+    by the <code>Blob</code> object. <!-- that sentence is meant to
     invoke "This interface represents immutable raw data." --> Any
     invokation of this method with a <code>Blob</code> argument that
     does not raise an exception must increase the <code
@@ -91537,7 +91539,8 @@
     title="">data</var> using a binary frame opcode; if the data
     cannot be sent, e.g. because it would need to be buffered but the
     buffer is full, the user agent must <i>close the WebSocket
-    connection</i>. The data to be sent is the data stored in the
+    connection</i> <span title="concept-websocket-close-fail">with
+    prejudice</span>. The data to be sent is the data stored in the
     buffer described by the <code>ArrayBuffer</code> object. <!-- that
     sentence is meant to invoke "The ArrayBuffer type describes a
     buffer used to store data for the array buffer views." at the top
@@ -91698,6 +91701,8 @@
   title="dom-WebSocket-CLOSING">CLOSING</code> (2) when this task
   runs.) <a href="#refsWSP">[WSP]</a></p>
 
+  <hr>
+
   <p id="closeWebSocket">When <i>the WebSocket connection is
   closed</i>, possibly <i title="">cleanly</i>, the user agent must
   <span>queue a task</span> to run the following substeps:</p>
@@ -91710,8 +91715,10 @@
    (3).</p></li>
 
    <li><p>If the user agent was required to <i>fail the websocket
-   connection</i>, <span>fire a simple event</span> named <code
-   title="">error</code> at the <code>WebSocket</code> object. <a
+   connection</i> or <i>the WebSocket connection is closed</i> <dfn
+   title="concept-websocket-close-fail">with prejudice</dfn>,
+   <span>fire a simple event</span> named <code title="">error</code>
+   at the <code>WebSocket</code> object. <a
    href="#refsWSP">[WSP]</a></p></li>
 
    <li><p>Create an event that uses the <code>CloseEvent</code>




More information about the Commit-Watchers mailing list