[Pkg-javascript-commits] [sockjs-client] 296/434: Add a note about disabled websockets to readme.

[Tonnerre Lombard]

This is an automated email from the git hooks/post-receive script.

tonnerre-guest pushed a commit to branch master
in repository sockjs-client.

commit ec1a8eac6f02772018fe6357fd8d087237655aa8
Author: Marek Majkowski <majek04 at gmail.com>
Date:   Thu Jan 12 15:49:19 2012 +0000

    Add a note about disabled websockets to readme.
---
 README.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 708e1f1..bd2cb55 100644
--- a/README.md
+++ b/README.md
@@ -148,14 +148,14 @@ Supported transports, by browser
 _Browser_       | _Websockets_     | _Streaming_ | _Polling_
 ----------------|------------------|-------------|-----------
 IE 7            | no               | no          | jsonp-polling
-IE 8, 9 (cookies=no) |    no       | xhr-streaming†  | xhr-polling†
+IE 8, 9 (cookies=no) |    no       | xhr-streaming † | xhr-polling †
 IE 8, 9 (cookies=yes)|    no       | iframe-htmlfile | iframe-xhr-polling
 Chrome 6-12     | hixie-76         | xhr-streaming   | xhr-polling
 Chrome 14+      | hybi-10          | xhr-streaming   | xhr-polling
-Firefox <10     | no               | xhr-streaming   | xhr-polling
+Firefox <10     | no ‡      | xhr-streaming   | xhr-polling
 Firefox 10+     | hybi-10          | xhr-streaming   | xhr-polling
 Safari 5        | hixie-76         | xhr-streaming   | xhr-polling
-Opera 10.7+     | no               | iframe-eventsource | iframe-xhr-polling
+Opera 10.70+    | no ‡      | iframe-eventsource | iframe-xhr-polling
 Konqueror       | no               | no          | jsonp-polling
 
 
@@ -165,6 +165,10 @@ Konqueror       | no               | no          | jsonp-polling
     makes it inaproppriate for deployments when the load balancer uses
     JSESSIONID cookie to do sticky sessions.
 
+ * **‡**: Opera 11.00 and Firefox 4.0 shipped with websockets
+     "hixie-76", but disabled the protocol due to security worries
+     just before releasing it. Native Websockets can be enabled by
+     manually chaning a browser setting.
 
 Supported transports, by name
 -----------------------------

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/sockjs-client.git