libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-02-01 03:12:42 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1233 from marcelklehr/fix/s.io-perf-with-modern-browsers

Browse source 
Let socket.io decide which transport is best for the browser
This commit is contained in:
John McLear 2012-11-29 06:55:51 -08:00
commit 53d6d0813e
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/node/hooks/express/socketio.js
View file

@ -36,13 +36,10 @@ exports.expressCreateServer = function (hook_name, args, cb) {
}); });
}); });
// the following has been successfully tested with the following browsers // there shouldn#t be a browser that isn't compatible to all
// works also behind reverse proxy // transports in this list at once
// Firefox 14.0.1 // e.g. XHR is disabled in IE by default, so in IE it should use jsonp-polling
// IE8 with Native XMLHTTP support io.set('transports', ['xhr-polling', 'jsonp-polling', 'htmlfile']);
// IE8 without Native XMLHTTP support
// Chrome 21.0.1180.79
io.set('transports', ['jsonp-polling']);
var socketIOLogger = log4js.getLogger("socket.io"); var socketIOLogger = log4js.getLogger("socket.io");
io.set('logger', { io.set('logger', {