[] (0) Handle TLS errors in the Web Socket Protocol. (and minor edito…

…rial fixes) git-svn-id: http://svn.whatwg.org/webapps@1843 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Jul 3, 2008 · 0bcdd88 · 0bcdd88
1 parent 557eee3
commit 0bcdd88
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/index b/index
@@ -41507,7 +41507,7 @@ data:&nbsp;test</pre>
    <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,16 +41525,19 @@ Proxy-authorization: Basic ZWRuYW1vZGU6bm9jYXBlcyE=</pre>
 
     <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
      the Web Socket connection</a> and abort these steps.
 
    <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>

diff --git a/source b/source
@@ -39063,7 +39063,7 @@ data:&nbsp;test</pre>
     <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 @@ Proxy-authorization: Basic ZWRuYW1vZGU6bm9jYXBlcyE=</pre>
 
     <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 @@ Proxy-authorization: Basic ZWRuYW1vZGU6bm9jYXBlcyE=</pre>
    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>