summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroshi Ichikawa <gimite@gmail.com>2011-12-27 20:14:10 +0900
committerHiroshi Ichikawa <gimite@gmail.com>2011-12-27 20:14:10 +0900
commit30b0e3ce94d928c32d5a9c1b054904a9e3a94533 (patch)
tree61bcf1bfcca2b154017d71f21759bc8d363be905
parent47c316c59312f137079aa67adae1d8ea6b126cc9 (diff)
downloadweb-socket-js-30b0e3ce94d928c32d5a9c1b054904a9e3a94533.tar.gz
Switching to WebSocket version defined in RFC 6455.
-rw-r--r--NEWS.md5
-rw-r--r--README.md4
-rw-r--r--WebSocketMain.swfbin177119 -> 177114 bytes
-rw-r--r--WebSocketMainInsecure.zipbin170252 -> 170226 bytes
-rw-r--r--flash-src/src/net/gimite/websocket/WebSocket.as6
-rw-r--r--web_socket.js2
6 files changed, 11 insertions, 6 deletions
diff --git a/NEWS.md b/NEWS.md
index 42caa9c..cec6d97 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,8 @@
+- 2011-12-27
+ - web-socket-js now speaks WebSocket defined in RFC 6455, which is
+ equivalent to hybi-13 to hybi-17. It no longer supports old draft
+ protocols.
+
- 2011-12-17
- web-socket-js now uses MozWebSocket when available. i.e. When you load
web_socket.js, WebSocket is defined as alias of MozWebSocket when
diff --git a/README.md b/README.md
index 6a320d9..1011e1b 100644
--- a/README.md
+++ b/README.md
@@ -149,8 +149,8 @@ Install [Flex 4 SDK](http://opensource.adobe.com/wiki/display/flexsdk/Download+F
## WebSocket protocol versions
-- web-socket-js supports [hybi-10 version](http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-10) of WebSocket protocol.
-- 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.
+- web-socket-js speaks WebSocket protocol defined in [RFC 6455](http://tools.ietf.org/html/rfc6455).
+- 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.
## License
diff --git a/WebSocketMain.swf b/WebSocketMain.swf
index 3307084..8174466 100644
--- a/WebSocketMain.swf
+++ b/WebSocketMain.swf
Binary files differ
diff --git a/WebSocketMainInsecure.zip b/WebSocketMainInsecure.zip
index 1cc1862..a11157b 100644
--- a/WebSocketMainInsecure.zip
+++ b/WebSocketMainInsecure.zip
Binary files differ
diff --git a/flash-src/src/net/gimite/websocket/WebSocket.as b/flash-src/src/net/gimite/websocket/WebSocket.as
index 4508557..0f32017 100644
--- a/flash-src/src/net/gimite/websocket/WebSocket.as
+++ b/flash-src/src/net/gimite/websocket/WebSocket.as
@@ -1,7 +1,7 @@
// Copyright: Hiroshi Ichikawa <http://gimite.net/en/>
// License: New BSD License
// Reference: http://dev.w3.org/html5/websockets/
-// Reference: http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-10
+// Reference: http://tools.ietf.org/html/rfc6455
package net.gimite.websocket {
@@ -244,8 +244,8 @@ public class WebSocket extends EventDispatcher {
"Upgrade: websocket\r\n" +
"Connection: Upgrade\r\n" +
"Sec-WebSocket-Key: {2}\r\n" +
- "Sec-WebSocket-Origin: {3}\r\n" +
- "Sec-WebSocket-Version: 8\r\n" +
+ "Origin: {3}\r\n" +
+ "Sec-WebSocket-Version: 13\r\n" +
"Cookie: {4}\r\n" +
"{5}" +
"\r\n",
diff --git a/web_socket.js b/web_socket.js
index c92676e..0561d10 100644
--- a/web_socket.js
+++ b/web_socket.js
@@ -1,7 +1,7 @@
// Copyright: Hiroshi Ichikawa <http://gimite.net/en/>
// License: New BSD License
// Reference: http://dev.w3.org/html5/websockets/
-// Reference: http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-10
+// Reference: http://tools.ietf.org/html/rfc6455
(function() {