[e] (0) Clarify what 'send' means and remove some redundant requireme…

…nts. git-svn-id: http://svn.whatwg.org/webapps@4642 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Feb 2, 2010 · 2d8dddc · 2d8dddc
1 parent 6e951d8
commit 2d8dddc
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 17 deletions.
diff --git a/complete.html b/complete.html
@@ -110,7 +110,7 @@
 
   <header class=head id=head><p><a class=logo href=http://www.whatwg.org/ rel=home><img alt=WHATWG src=/images/logo></a></p>
    <hgroup><h1>Web Applications 1.0</h1>
-    <h2 class="no-num no-toc">Draft Standard &mdash; 1 February 2010</h2>
+    <h2 class="no-num no-toc">Draft Standard &mdash; 2 February 2010</h2>
    </hgroup><p>You can take part in this work. <a href=http://www.whatwg.org/mailing-list>Join the working group's discussion list.</a></p>
    <p><strong>Web designers!</strong> We have a <a href=http://blog.whatwg.org/faq/>FAQ</a>, a <a href=http://forums.whatwg.org/>forum</a>, and a <a href=http://www.whatwg.org/mailing-list#help>help mailing list</a> for you!</p>
    <!--<p class="impl"><strong>Implementors!</strong> We have a <a href="http://www.whatwg.org/mailing-list#implementors">mailing list</a> for you too!</p>-->
@@ -939,7 +939,8 @@ <h2 class="no-num no-toc" id=contents>Table of contents</h2>
          <li><a href=#relationship-to-tcp/ip-and-http><span class=secno>10.3.4.1.5 </span>Relationship to TCP/IP and HTTP</a></li>
          <li><a href=#establishing-a-connection><span class=secno>10.3.4.1.6 </span>Establishing a connection</a></li>
          <li><a href=#writing-a-simple-web-socket-server><span class=secno>10.3.4.1.7 </span>Writing a simple Web Socket server</a></li>
-         <li><a href=#subprotocols-using-the-web-socket-protocol><span class=secno>10.3.4.1.8 </span>Subprotocols using the Web Socket protocol</a></ol></li>
+         <li><a href=#subprotocols-using-the-web-socket-protocol><span class=secno>10.3.4.1.8 </span>Subprotocols using the Web Socket protocol</a></li>
+         <li><a href=#terminology-1><span class=secno>10.3.4.1.9 </span>Terminology</a></ol></li>
        <li><a href=#web-socket-urls><span class=secno>10.3.4.2 </span>Web Socket URLs</a>
         <ol>
          <li><a href=#parsing-web-socket-urls><span class=secno>10.3.4.2.1 </span>Parsing Web Socket URLs</a></li>
@@ -67164,6 +67165,14 @@ <h6 id=subprotocols-using-the-web-socket-protocol><span class=secno>10.3.4.1.8 <
 
 
 
+  <h6 id=terminology-1><span class=secno>10.3.4.1.9 </span>Terminology</h6>
+
+
+  <p>When an implementation is required to <i>send</i> data as part of
+  the Web Socket protocol, the implementation may delay the actual
+  transmission arbitrarily, e.g. buffering data so as to send fewer IP
+  packets.</p>
+
 
   <h5 id=web-socket-urls><span class=secno>10.3.4.2 </span>Web Socket URLs</h5>
 
@@ -67970,11 +67979,7 @@ <h6 id=handshake><span class=secno>10.3.4.3.1 </span>Handshake</h6>
 
       <ol><li><p>Let <var title="">raw data</var> be an empty byte array.</li>
 
-       <li id=ws-cd-data><p><i>Data</i>: Read a byte, let <var title="">b</var> be that byte. If the client runs out of
-       resources for buffering the incoming data, or hits an
-       artificial resource limit intended to avoid resource
-       starvation, then it must <a href=#fail-the-web-socket-connection>fail the Web Socket
-       connection</a> and abort these steps.</p>
+       <li id=ws-cd-data><p><i>Data</i>: Read a byte, let <var title="">b</var> be that byte.</p>
 
        <li><p>If <var title="">b</var> is not 0xFF, then append <var title="">b</var> to <var title="">raw data</var> and return to
        the previous step (labeled <a href=#ws-cd-data><i>data</i></a>).</li>
@@ -67992,7 +67997,9 @@ <h6 id=handshake><span class=secno>10.3.4.3.1 </span>Handshake</h6>
    <li><p>Return to the first step to read the next byte.</li>
 
   </ol><p>If the user agent is faced with content that is too large to be
-  handled appropriately, then it must <a href=#fail-the-web-socket-connection>fail the Web Socket
+  handled appropriately, runs out of resources for buffering incoming
+  data, or hits an artificial resource limit intended to avoid
+  resource starvation, then it must <a href=#fail-the-web-socket-connection>fail the Web Socket
   connection</a>.</p>
 
   <hr><p>Once a <a href=#web-socket-connection-is-established>Web Socket connection is established</a>, the
@@ -88079,6 +88086,7 @@ <h3 class="no-num">Reflecting IDL attributes</h3>
   Graham Klyne,
   Greg Botten,
   Greg Houston,
+  Greg Wilkins,
   Gregg Tavares,
   Grey,
   Gytis Jakutonis,

diff --git a/index b/index
@@ -112,7 +112,7 @@
 
   <header class=head id=head><p><a class=logo href=http://www.whatwg.org/ rel=home><img alt=WHATWG src=/images/logo></a></p>
    <hgroup><h1>HTML5 (including next generation additions still in development)</h1>
-    <h2 class="no-num no-toc">Draft Standard &mdash; 30 January 2010</h2>
+    <h2 class="no-num no-toc">Draft Standard &mdash; 2 February 2010</h2>
    </hgroup><p>You can take part in this work. <a href=http://www.whatwg.org/mailing-list>Join the working group's discussion list.</a></p>
    <p><strong>Web designers!</strong> We have a <a href=http://blog.whatwg.org/faq/>FAQ</a>, a <a href=http://forums.whatwg.org/>forum</a>, and a <a href=http://www.whatwg.org/mailing-list#help>help mailing list</a> for you!</p>
    <!--<p class="impl"><strong>Implementors!</strong> We have a <a href="http://www.whatwg.org/mailing-list#implementors">mailing list</a> for you too!</p>-->
@@ -82534,6 +82534,7 @@ interface <a href=#htmldocument>HTMLDocument</a> {
   Graham Klyne,
   Greg Botten,
   Greg Houston,
+  Greg Wilkins,
   Gregg Tavares,
   Grey,
   Gytis Jakutonis,

diff --git a/source b/source
@@ -76663,11 +76663,12 @@ Frame type byte &lt;-------------------------------------.
 
 
 <!--END complete-->
-
   <!--BOILERPLATE middle-ietf-conformance-->
+<!--START complete-->
 
   <h6>Terminology</h6>
 
+<!--END complete-->
   <p><dfn title="converted to ASCII lowercase">Converting a string to
   ASCII lowercase</dfn> means replacing all characters in the range
   U+0041 to U+005A (i.e. LATIN CAPITAL LETTER A to LATIN CAPITAL
@@ -76679,9 +76680,13 @@ Frame type byte &lt;-------------------------------------.
   might or might not be a valid URI or IRI and to which certain error
   handling behaviors will be applied when the string is parsed. <a
   href="#refsHTML5">[HTML5]</a></p>
-
 <!--START complete-->
 
+  <p>When an implementation is required to <i>send</i> data as part of
+  the Web Socket protocol, the implementation may delay the actual
+  transmission arbitrarily, e.g. buffering data so as to send fewer IP
+  packets.</p>
+
 
   <h5>Web Socket URLs</h5>
 
@@ -77607,11 +77612,7 @@ multi-origin semantics described in [ORIGIN] applying. (http-origin)
        <li><p>Let <var title="">raw data</var> be an empty byte array.</p></li>
 
        <li id="ws-cd-data"><p><i>Data</i>: Read a byte, let <var
-       title="">b</var> be that byte. If the client runs out of
-       resources for buffering the incoming data, or hits an
-       artificial resource limit intended to avoid resource
-       starvation, then it must <span>fail the Web Socket
-       connection</span> and abort these steps.</p>
+       title="">b</var> be that byte.</p>
 
        <li><p>If <var title="">b</var> is not 0xFF, then append <var
        title="">b</var> to <var title="">raw data</var> and return to
@@ -77638,7 +77639,9 @@ multi-origin semantics described in [ORIGIN] applying. (http-origin)
   </ol>
 
   <p>If the user agent is faced with content that is too large to be
-  handled appropriately, then it must <span>fail the Web Socket
+  handled appropriately, runs out of resources for buffering incoming
+  data, or hits an artificial resource limit intended to avoid
+  resource starvation, then it must <span>fail the Web Socket
   connection</span>.</p>
 
   <hr>
@@ -98671,6 +98674,7 @@ interface <span>HTMLDocument</span> {
   Graham Klyne,
   Greg Botten,
   Greg Houston,
+  Greg Wilkins,
   Gregg Tavares,
   Grey,
   Gytis Jakutonis,