- From: poot <cvsmail@w3.org>
- Date: Mon, 7 Jul 2008 18:20:32 +0900 (JST)
- To: public-html-diffs@w3.org
Make the Web Socket Protocol handshake more unique. (Re: websocket HTTP response parsing) (credit: pt, jr) (whatwg r1849) (changed by: Ian Hickson) Diffs for this change per section: http://people.w3.org/mike/diffs/html5/spec/Overview.1.1038.html#status http://people.w3.org/mike/diffs/html5/spec/Overview.1.1038.html#a-vocabulary http://people.w3.org/mike/diffs/html5/spec/Overview.1.1038.html#ws-ua-1 http://people.w3.org/mike/diffs/html5/spec/Overview.1.1038.html#minimal http://people.w3.org/mike/diffs/html5/spec/Overview.1.1038.html#editors0 Current content per affected section: http://dev.w3.org/html5/spec/Overview.html#status http://dev.w3.org/html5/spec/Overview.html#a-vocabulary http://dev.w3.org/html5/spec/Overview.html#ws-ua-1 http://dev.w3.org/html5/spec/Overview.html#minimal http://dev.w3.org/html5/spec/Overview.html#editors0 Previously published WD content per affected section: http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#status http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#a-vocabulary http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#ws-ua-1 http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#minimal http://www.w3.org/TR/2008/WD-html5-20080610/single-page/#editors0 Cumulative diff: http://people.w3.org/mike/diffs/html5/spec/Overview.diff.html http://dev.w3.org/cvsweb/html5/spec/Overview.html?r1=1.1037&r2=1.1038&f=h http://html5.org/tools/web-apps-tracker?from=1848&to=1849 =================================================================== RCS file: /sources/public/html5/spec/Overview.html,v retrieving revision 1.1037 retrieving revision 1.1038 diff -u -d -r1.1037 -r1.1038 --- Overview.html 6 Jul 2008 00:08:58 -0000 1.1037 +++ Overview.html 7 Jul 2008 09:17:57 -0000 1.1038 @@ -59,7 +59,7 @@ for HTML and XHTML</h2> <h2 class="no-num no-toc" id=editors0><!-- "W3C Working Draft" --> - Editor's Draft <!--ZZZ--> 6 July 2008</h2> + Editor's Draft <!--ZZZ--> 7 July 2008</h2> <dl><!-- ZZZ: update the month/day <dt>This Version:</dt> @@ -207,7 +207,7 @@ <p>The W3C <a href="http://www.w3.org/html/wg/">HTML Working Group</a> is the W3C working group responsible for this specification's progress along - the W3C Recommendation track. <!--ZZZ:--> This specification is the 6 July + the W3C Recommendation track. <!--ZZZ:--> This specification is the 7 July 2008 <!--ZZZ "Working Draft"-->Editor's Draft. <!--:ZZZ--></p> <!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --> <!-- relationship to other work (required) --> @@ -41722,21 +41722,22 @@ <p class=note>Just a CRLF (a blank line).</p> <li> - <p>Read the first 75 bytes from the server. If the connection closes - before 75 bytes are received, or if the first 75 bytes aren't exactly + <p>Read the first 85 bytes from the server. If the connection closes + before 85 bytes are received, or if the first 85 bytes aren't exactly equal to the following bytes, then <a href="#fail-the">fail the Web Socket connection</a> and abort these steps.</p> - <pre>48 54 54 50 2f 31 2e 31 20 31 30 31 20 53 77 69 -74 63 68 69 6e 67 20 50 72 6f 74 6f 63 6f 6c 73 -0d 0a 55 70 67 72 61 64 65 3a 20 57 65 62 53 6f -63 6b 65 74 0d 0a 43 6f 6e 6e 65 63 74 69 6f 6e -3a 20 55 70 67 72 61 64 65 0d 0a</pre> + <pre>48 54 54 50 2f 31 2e 31 20 31 30 31 20 57 65 62 +20 53 6f 63 6b 65 74 20 50 72 6f 74 6f 63 6f 6c +20 48 61 6e 64 73 68 61 6b 65 0d 0a 55 70 67 72 +61 64 65 3a 20 57 65 62 53 6f 63 6b 65 74 0d 0a +43 6f 6e 6e 65 63 74 69 6f 6e 3a 20 55 70 67 72 +61 64 65 0d 0a</pre> <p class=note>The string - "HTTP/1.1 101 Switching Protocols", CRLF, the string - "Upgrade: WebSocket", CRLF, the string "Connection: Upgrade", - CRLF.</p> + "HTTP/1.1 101 Web Socket Protocol Handshake", + CRLF, the string "Upgrade: WebSocket", CRLF, the string + "Connection: Upgrade", CRLF.</p> <p class=big-issue>What if the response is a 401 asking for credentials?</p> @@ -42060,11 +42061,12 @@ <p>Listen on a port for TCP/IP. Upon receiving a connection request, open a connection and send the following bytes back to the client: - <pre>48 54 54 50 2f 31 2e 31 20 31 30 31 20 53 77 69 -74 63 68 69 6e 67 20 50 72 6f 74 6f 63 6f 6c 73 -0d 0a 55 70 67 72 61 64 65 3a 20 57 65 62 53 6f -63 6b 65 74 0d 0a 43 6f 6e 6e 65 63 74 69 6f 6e -3a 20 55 70 67 72 61 64 65 0d 0a</pre> + <pre>48 54 54 50 2f 31 2e 31 20 31 30 31 20 57 65 62 +20 53 6f 63 6b 65 74 20 50 72 6f 74 6f 63 6f 6c +20 48 61 6e 64 73 68 61 6b 65 0d 0a 55 70 67 72 +61 64 65 3a 20 57 65 62 53 6f 63 6b 65 74 0d 0a +43 6f 6e 6e 65 63 74 69 6f 6e 3a 20 55 70 67 72 +61 64 65 0d 0a</pre> <p>Send the string "<code title="">WebSocket-Origin</code>" followed by a U+003A COLON (":") followed by the <a href="#ascii" title="ASCII
Received on Monday, 7 July 2008 09:21:10 UTC