[html5] r5050 - [e] (0) Be less confusing about how to skip a space after the colon when reading [...]

[whatwg at whatwg.org]

Author: ianh
Date: 2010-04-14 17:46:06 -0700 (Wed, 14 Apr 2010)
New Revision: 5050

Modified:
   complete.html
   source
Log:
[e] (0) Be less confusing about how to skip a space after the colon when reading fields in the handshake.

Modified: complete.html
===================================================================
--- complete.html	2010-04-15 00:21:43 UTC (rev 5049)
+++ complete.html	2010-04-15 00:46:06 UTC (rev 5050)
@@ -70072,33 +70072,16 @@
 
    <li>
 
-    <p>Read a byte from the server.</p>
+    <p>Let <var title="">count</var> equal 0.</p>
 
-    <p>If the connection closes before this byte is received, then
-    <a href=#fail-the-websocket-connection>fail the WebSocket connection</a> and abort these
-    steps.</p>
+    <p class=note>This is used in the next step to skip past a space
+    character after the colon, if necessary.</p>
 
-    <p>Otherwise, handle the byte as described in the appropriate
-    entry below:</p>
-
-    <dl class=switch><dt>If the byte is 0x20 (ASCII space)</dt>
-
-     <dd>Ignore the byte and move on to the next step.</dd>
-
-
-     <dt>Otherwise</dt>
-
-     <dd>Treat the byte as described by the list in the next step,
-     then move on to that next step for real.</dd>
-
-    </dl><p class=note>This skips past a space character after the colon,
-    if necessary.</p>
-
    </li>
 
    <li>
 
-    <p>Read a byte from the server.</p>
+    <p>Read a byte from the server and increment <var title="">count</var> by 1.</p>
 
     <p>If the connection closes before this byte is received, then
     <a href=#fail-the-websocket-connection>fail the WebSocket connection</a> and abort these
@@ -70107,8 +70090,13 @@
     <p>Otherwise, handle the byte as described in the appropriate
     entry below:</p>
 
-    <dl class=switch><dt>If the byte is 0x0D (ASCII CR)</dt>
+    <dl class=switch><dt>If the byte is 0x20 (ASCII space) and <var title="">count</var> equals 1</dt>
 
+     <dd>Ignore the byte and redo this step for the next byte.</dd>
+
+
+     <dt>If the byte is 0x0D (ASCII CR)</dt>
+
      <dd>Move on to the next step.</dd>
 
 
@@ -70123,8 +70111,8 @@
      <dd>Append the byte to the <var title="">value</var> byte array
      and redo this step for the next byte.</dd>
 
-    </dl><p class=note>This reads a field value, terminated by a
-    CRLF.</p>
+    </dl><p class=note>This reads a field value, terminated by a CRLF,
+    skipping past a single space after the colon if there is one.</p>
 
    </li>
 

Modified: source
===================================================================
--- source	2010-04-15 00:21:43 UTC (rev 5049)
+++ source	2010-04-15 00:46:06 UTC (rev 5050)
@@ -78611,37 +78611,17 @@
 
    <li>
 
-    <p>Read a byte from the server.</p>
+    <p>Let <var title="">count</var> equal 0.</p>
 
-    <p>If the connection closes before this byte is received, then
-    <span>fail the WebSocket connection</span> and abort these
-    steps.</p>
+    <p class="note">This is used in the next step to skip past a space
+    character after the colon, if necessary.</p>
 
-    <p>Otherwise, handle the byte as described in the appropriate
-    entry below:</p>
-
-    <dl class="switch">
-
-     <dt>If the byte is 0x20 (ASCII space)</dt>
-
-     <dd>Ignore the byte and move on to the next step.</dd>
-
-
-     <dt>Otherwise</dt>
-
-     <dd>Treat the byte as described by the list in the next step,
-     then move on to that next step for real.</dd>
-
-    </dl>
-
-    <p class="note">This skips past a space character after the colon,
-    if necessary.</p>
-
    </li>
 
    <li>
 
-    <p>Read a byte from the server.</p>
+    <p>Read a byte from the server and increment <var
+    title="">count</var> by 1.</p>
 
     <p>If the connection closes before this byte is received, then
     <span>fail the WebSocket connection</span> and abort these
@@ -78652,6 +78632,11 @@
 
     <dl class="switch">
 
+     <dt>If the byte is 0x20 (ASCII space) and <var title="">count</var> equals 1</dt>
+
+     <dd>Ignore the byte and redo this step for the next byte.</dd>
+
+
      <dt>If the byte is 0x0D (ASCII CR)</dt>
 
      <dd>Move on to the next step.</dd>
@@ -78670,8 +78655,8 @@
 
     </dl>
 
-    <p class="note">This reads a field value, terminated by a
-    CRLF.</p>
+    <p class="note">This reads a field value, terminated by a CRLF,
+    skipping past a single space after the colon if there is one.</p>
 
    </li>