[e] (0) Apparently 'uk' is the language code, 'ua' is the country cod…

…e. So it was right after al and I'm a doofus. git-svn-id: http://svn.whatwg.org/webapps@4128 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Oct 13, 2009 · 1386055 · 1386055
1 parent ddf8261
commit 1386055
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 18 deletions.
diff --git a/complete.html b/complete.html
@@ -959,11 +959,8 @@ <h2 class="no-num no-toc" id=contents>Table of contents</h2>
      <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 @@ <h5 id=garbage-collection-1><span class=secno>10.3.3.1 </span>Garbage collection
   <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,6 +66013,14 @@ <h6 id=security-model><span class=secno>10.3.4.1.4 </span>Security model</h6>
   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>
 
@@ -69543,7 +69545,7 @@ <h5 id=determining-the-character-encoding><span class=secno>11.2.2.1 </span>Dete
       <tr><td>tr<!-- -TR -->
        <td>windows-1254 <!-- ISO-8859-9 -->
 
-      <tr><td>ua <!-- uk -->
+      <tr><td>uk
        <td>windows-1251
 
       <tr><td>vi

diff --git a/index b/index
@@ -60564,7 +60564,7 @@ interface <dfn id=messageport>MessagePort</dfn> {
       <tr><td>tr<!-- -TR -->
        <td>windows-1254 <!-- ISO-8859-9 -->
 
-      <tr><td>ua <!-- uk -->
+      <tr><td>uk
        <td>windows-1251
 
       <tr><td>vi

diff --git a/source b/source
@@ -74071,11 +74071,8 @@ interface <dfn>WebSocket</dfn> {
   <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,6 +74227,14 @@ Frame type byte &lt;-------------------------------------.
   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>
 
@@ -78332,7 +78337,7 @@ interface <dfn>MessagePort</dfn> {
        <td>windows-1254 <!-- ISO-8859-9 -->
 
       <tr>
-       <td>ua <!-- uk -->
+       <td>uk
        <td>windows-1251
 
       <tr>