[html5] r1843 - [] (0) Handle TLS errors in the Web Socket Protocol. (and minor editorial fixes)

[whatwg at whatwg.org]

Author: ianh
Date: 2008-07-03 02:05:56 -0700 (Thu, 03 Jul 2008)
New Revision: 1843

Modified:
   index
   source
Log:
[] (0) Handle TLS errors in the Web Socket Protocol. (and minor editorial fixes)

Modified: index
===================================================================
--- index	2008-07-03 09:03:17 UTC (rev 1842)
+++ index	2008-07-03 09:05:56 UTC (rev 1843)
@@ -41507,7 +41507,7 @@
    <li>
     <p>If the user agent is configured to use a proxy to connect to port <var
      title="">port</var>, then connect to that proxy and ask it to open a
-     TCP/IP connection to the host given by <var title="">host</var> to the
+     TCP/IP connection to the host given by <var title="">host</var> and the
      port given by <var title="">port</var>.</p>
 
     <div class=example>
@@ -41525,7 +41525,7 @@
 
     <p>Otherwise, if the user agent is not configured to use a proxy, then
      open a TCP/IP connection to the host given by <var title="">host</var>
-     to the port given by <var title="">port</var>.</p>
+     and the port given by <var title="">port</var>.</p>
 
    <li>
     <p>If the connection could not be opened, then <a href="#fail-the">fail
@@ -41533,8 +41533,11 @@
 
    <li>
     <p>If <var title="">secure</var> is true, perform a TLS handshake over
-     the connection. All further communication on this channel must run
-     through the encrypted tunnel. <a href="#refsRFC2246">[RFC2246]</a>
+     the connection. If this fails (e.g. the server's certificate could not
+     be verified), then <a href="#fail-the">fail the Web Socket
+     connection</a> and abort these steps. Otherwise, all further
+     communication on this channel must run through the encrypted tunnel. <a
+     href="#refsRFC2246">[RFC2246]</a>
 
    <li>
     <p>Send the following bytes to the remote side (the server):</p>

Modified: source
===================================================================
--- source	2008-07-03 09:03:17 UTC (rev 1842)
+++ source	2008-07-03 09:05:56 UTC (rev 1843)
@@ -39063,7 +39063,7 @@
     <p>If the user agent is configured to use a proxy to connect to
     port <var title="">port</var>, then connect to that proxy and ask
     it to open a TCP/IP connection to the host given by <var
-    title="">host</var> to the port given by <var
+    title="">host</var> and the port given by <var
     title="">port</var>.</p>
 
     <div class="example">
@@ -39083,7 +39083,7 @@
 
     <p>Otherwise, if the user agent is not configured to use a proxy,
     then open a TCP/IP connection to the host given by <var
-    title="">host</var> to the port given by <var
+    title="">host</var> and the port given by <var
     title="">port</var>.</p>
 
    </li>
@@ -39092,9 +39092,11 @@
    Web Socket connection</span> and abort these steps.</p></li>
 
    <li><p>If <var title="">secure</var> is true, perform a TLS
-   handshake over the connection. All further communication on this
-   channel must run through the encrypted tunnel. <a
-   href="#refsRFC2246">[RFC2246]</a></p></li>
+   handshake over the connection. If this fails (e.g. the server's
+   certificate could not be verified), then <span>fail the Web Socket
+   connection</span> and abort these steps. Otherwise, all further
+   communication on this channel must run through the encrypted
+   tunnel. <a href="#refsRFC2246">[RFC2246]</a></p></li>
 
    <li>