Skip to content

Commit 30b0e3c

Browse files
committed
Switching to WebSocket version defined in RFC 6455.
1 parent 47c316c commit 30b0e3c

File tree

6 files changed

+11
-6
lines changed

6 files changed

+11
-6
lines changed

NEWS.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
- 2011-12-27
2+
- web-socket-js now speaks WebSocket defined in RFC 6455, which is
3+
equivalent to hybi-13 to hybi-17. It no longer supports old draft
4+
protocols.
5+
16
- 2011-12-17
27
- web-socket-js now uses MozWebSocket when available. i.e. When you load
38
web_socket.js, WebSocket is defined as alias of MozWebSocket when

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ Install [Flex 4 SDK](http://opensource.adobe.com/wiki/display/flexsdk/Download+F
149149

150150
## WebSocket protocol versions
151151

152-
- web-socket-js supports [hybi-10 version](http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-10) of WebSocket protocol.
153-
- web-socket-js doesn't speak other versions including hixie-76, which was supported by old version of this library. If you really need web-socket-js which speaks hixie-76, you can get it from [hixie-76 branch](https://github.com/gimite/web-socket-js/tree/hixie-76), but the branch is no longer maintained.
152+
- web-socket-js speaks WebSocket protocol defined in [RFC 6455](http://tools.ietf.org/html/rfc6455).
153+
- web-socket-js doesn't speak old draft versions of WebSocket protocol including hixie-76, which was supported by old version of this library. If you really need web-socket-js which speaks hixie-76, you can get it from [hixie-76 branch](https://github.com/gimite/web-socket-js/tree/hixie-76), but the branch is no longer maintained.
154154

155155

156156
## License

WebSocketMain.swf

-5 Bytes
Binary file not shown.

WebSocketMainInsecure.zip

-26 Bytes
Binary file not shown.

flash-src/src/net/gimite/websocket/WebSocket.as

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright: Hiroshi Ichikawa <http://gimite.net/en/>
22
// License: New BSD License
33
// Reference: http://dev.w3.org/html5/websockets/
4-
// Reference: http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-10
4+
// Reference: http://tools.ietf.org/html/rfc6455
55

66
package net.gimite.websocket {
77

@@ -244,8 +244,8 @@ public class WebSocket extends EventDispatcher {
244244
"Upgrade: websocket\r\n" +
245245
"Connection: Upgrade\r\n" +
246246
"Sec-WebSocket-Key: {2}\r\n" +
247-
"Sec-WebSocket-Origin: {3}\r\n" +
248-
"Sec-WebSocket-Version: 8\r\n" +
247+
"Origin: {3}\r\n" +
248+
"Sec-WebSocket-Version: 13\r\n" +
249249
"Cookie: {4}\r\n" +
250250
"{5}" +
251251
"\r\n",

web_socket.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright: Hiroshi Ichikawa <http://gimite.net/en/>
22
// License: New BSD License
33
// Reference: http://dev.w3.org/html5/websockets/
4-
// Reference: http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-10
4+
// Reference: http://tools.ietf.org/html/rfc6455
55

66
(function() {
77

0 commit comments

Comments
 (0)