[html5] r4128 - [e] (0) Apparently 'uk' is the language code, 'ua' is the country code. So it wa [...]

[whatwg at whatwg.org]

Author: ianh
Date: 2009-10-13 14:42:56 -0700 (Tue, 13 Oct 2009)
New Revision: 4128

Modified:
   complete.html
   index
   source
Log:
[e] (0) Apparently 'uk' is the language code, 'ua' is the country code. So it was right after al and I'm a doofus.

Modified: complete.html
===================================================================
--- complete.html	2009-10-13 11:16:54 UTC (rev 4127)
+++ complete.html	2009-10-13 21:42:56 UTC (rev 4128)
@@ -959,11 +959,8 @@
      <li><a href=#websocket-protocol title="This protocol enables two-way
   communication between a user agent running untrusted code running in
   a controlled environment to a remote host that understands the
-  protocol. It is intended to fail to communicate with servers of
-  pre-existing protocols like SMTP or HTTP, while allowing HTTP
-  servers to opt-in to supporting this protocol if desired. It is
-  designed to be easy to implement on the server side."><span class=secno>10.3.4 </span>The Web Socket
-  protocol</a>
+  protocol. It is designed to be easy to implement on the server
+  side."><span class=secno>10.3.4 </span>The Web Socket protocol</a>
       <ol>
        <li><a href=#introduction-8><span class=secno>10.3.4.1 </span>Introduction</a>
         <ol>
@@ -65871,11 +65868,8 @@
   <h4 id=websocket-protocol title="This protocol enables two-way
   communication between a user agent running untrusted code running in
   a controlled environment to a remote host that understands the
-  protocol. It is intended to fail to communicate with servers of
-  pre-existing protocols like SMTP or HTTP, while allowing HTTP
-  servers to opt-in to supporting this protocol if desired. It is
-  designed to be easy to implement on the server side."><span class=secno>10.3.4 </span>The Web Socket
-  protocol</h4>
+  protocol. It is designed to be easy to implement on the server
+  side."><span class=secno>10.3.4 </span>The Web Socket protocol</h4>
 
   <div class=no-rfc>
    <p class=note>This section will be extracted into an RFC in due
@@ -66019,7 +66013,15 @@
   the origin model is not useful, as the client can provide any
   arbitrary origin string.</p>
 
+  <p>This protocol is intended to fail to establish a connection with
+  servers of pre-existing protocols like SMTP or HTTP, while allowing
+  HTTP servers to opt-in to supporting this protocol if desired. This
+  is achieved by having a strict and elaborate handshake, and by
+  limiting the data that can be inserted into the connection before
+  the handshake is finished (thus limiting how much the server can be
+  influenced).</p>
 
+
   <h6 id=relationship-to-tcp/ip-and-http><span class=secno>10.3.4.1.5 </span>Relationship to TCP/IP and HTTP</h6>
 
   <p><i>This section is non-normative.</i></p>
@@ -69543,7 +69545,7 @@
       <tr><td>tr<!-- -TR -->
        <td>windows-1254 <!-- ISO-8859-9 -->
 
-      <tr><td>ua <!-- uk -->
+      <tr><td>uk
        <td>windows-1251
 
       <tr><td>vi

Modified: index
===================================================================
--- index	2009-10-13 11:16:54 UTC (rev 4127)
+++ index	2009-10-13 21:42:56 UTC (rev 4128)
@@ -60564,7 +60564,7 @@
       <tr><td>tr<!-- -TR -->
        <td>windows-1254 <!-- ISO-8859-9 -->
 
-      <tr><td>ua <!-- uk -->
+      <tr><td>uk
        <td>windows-1251
 
       <tr><td>vi

Modified: source
===================================================================
--- source	2009-10-13 11:16:54 UTC (rev 4127)
+++ source	2009-10-13 21:42:56 UTC (rev 4128)
@@ -74071,11 +74071,8 @@
   <h4 id="websocket-protocol" title="This protocol enables two-way
   communication between a user agent running untrusted code running in
   a controlled environment to a remote host that understands the
-  protocol. It is intended to fail to communicate with servers of
-  pre-existing protocols like SMTP or HTTP, while allowing HTTP
-  servers to opt-in to supporting this protocol if desired. It is
-  designed to be easy to implement on the server side.">The Web Socket
-  protocol</h4>
+  protocol. It is designed to be easy to implement on the server
+  side.">The Web Socket protocol</h4>
 
   <div class="no-rfc">
    <p class="note">This section will be extracted into an RFC in due
@@ -74230,7 +74227,15 @@
   the origin model is not useful, as the client can provide any
   arbitrary origin string.</p>
 
+  <p>This protocol is intended to fail to establish a connection with
+  servers of pre-existing protocols like SMTP or HTTP, while allowing
+  HTTP servers to opt-in to supporting this protocol if desired. This
+  is achieved by having a strict and elaborate handshake, and by
+  limiting the data that can be inserted into the connection before
+  the handshake is finished (thus limiting how much the server can be
+  influenced).</p>
 
+
   <h6>Relationship to TCP/IP and HTTP</h6>
 
   <p><i>This section is non-normative.</i></p>
@@ -78332,7 +78337,7 @@
        <td>windows-1254 <!-- ISO-8859-9 -->
 
       <tr>
-       <td>ua <!-- uk -->
+       <td>uk
        <td>windows-1251
 
       <tr>