diff options
author | Marcel Klehr <mklehr@gmx.net> | 2012-11-29 13:42:37 +0100 |
---|---|---|
committer | Marcel Klehr <mklehr@gmx.net> | 2012-11-29 13:42:37 +0100 |
commit | 719fb7e04508f74b64bd0c4ed9bf8119f35686bf (patch) | |
tree | a8126610577bec691db4bdeb4ff8a0fb1ef3bcd5 /src/node/hooks/express/socketio.js | |
parent | 064bafe97345c763e0c73dd39bb76f543ab5d8c0 (diff) | |
download | etherpad-lite-719fb7e04508f74b64bd0c4ed9bf8119f35686bf.zip |
Let socket.io decide which transport is best for the browser
Diffstat (limited to 'src/node/hooks/express/socketio.js')
-rw-r--r-- | src/node/hooks/express/socketio.js | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/node/hooks/express/socketio.js b/src/node/hooks/express/socketio.js index 546ba2af..c2b9ff6c 100644 --- a/src/node/hooks/express/socketio.js +++ b/src/node/hooks/express/socketio.js @@ -36,13 +36,10 @@ exports.expressCreateServer = function (hook_name, args, cb) { }); }); - // the following has been successfully tested with the following browsers - // works also behind reverse proxy - // Firefox 14.0.1 - // IE8 with Native XMLHTTP support - // IE8 without Native XMLHTTP support - // Chrome 21.0.1180.79 - io.set('transports', ['jsonp-polling']); + // there shouldn#t be a browser that isn't compatible to all + // transports in this list at once + // e.g. XHR is disabled in IE by default, so in IE it should use jsonp-polling + io.set('transports', ['xhr-polling', 'jsonp-polling', 'htmlfile']); var socketIOLogger = log4js.getLogger("socket.io"); io.set('logger', { |