summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroshi Ichikawa <gimite@gmail.com>2011-05-07 11:18:12 +0900
committerHiroshi Ichikawa <gimite@gmail.com>2011-05-07 11:18:12 +0900
commitfa9e686e386a7a774bfd3ad50cbbb526603cd399 (patch)
tree5a419e523683d86ced05a2a0c31648d2c2580ea4
parentfd5fa42d4428b766c28b87c64c8c67162974b9f0 (diff)
parentd0163b79077490075a1eaf8fb51325968ab60f49 (diff)
downloadweb-socket-js-fa9e686e386a7a774bfd3ad50cbbb526603cd399.tar.gz
Merge branch 'master' into hybi-07
-rw-r--r--README.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/README.md b/README.md
index 28783d6..239e381 100644
--- a/README.md
+++ b/README.md
@@ -141,6 +141,13 @@ Install [Flex 4 SDK](http://opensource.adobe.com/wiki/display/flexsdk/Download+F
$ ./build.sh
+## WebSocket protocol versions
+
+- web-socket-js supports [Hixie 76 version](http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-76) of WebSocket protocol by default i.e. in [master branch](https://github.com/gimite/web-socket-js).
+- If you want to try newer [Hybi 07 version](http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-07), check out from [hybi-07 branch](https://github.com/gimite/web-socket-js/tree/hybi-07). This will become the master branch in the future, probably when Chrome switches to Hybi 07.
+- Hixie 75 or before is no longer supported.
+
+
## License
New BSD License.