diff options
| author | John McLear <john@mclear.co.uk> | 2012-09-03 06:35:52 -0700 |
|---|---|---|
| committer | John McLear <john@mclear.co.uk> | 2012-09-03 06:35:52 -0700 |
| commit | de7934d9fbfdc385ab1b8e4c9654b90c69207d03 (patch) | |
| tree | 8fc9c0762f0c3da417a475fb315eec0f7d6bad25 /src/node | |
| parent | 23d22b92fdb201deac4160cbf83867204407c6cb (diff) | |
| parent | 67088e5b7fb5a493a9040eae7f2ea741c48b7099 (diff) | |
| download | etherpad-lite-de7934d9fbfdc385ab1b8e4c9654b90c69207d03.zip | |
Merge pull request #958 from Wikinaut/fix-ie8-native-xmlhttp-support-disabled-issues
Fix ie8 native xmlhttp support disabled issues
Diffstat (limited to 'src/node')
| -rw-r--r-- | src/node/hooks/express/socketio.js | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/node/hooks/express/socketio.js b/src/node/hooks/express/socketio.js index 132283a7..4f780cb0 100644 --- a/src/node/hooks/express/socketio.js +++ b/src/node/hooks/express/socketio.js @@ -26,10 +26,13 @@ exports.expressCreateServer = function (hook_name, args, cb) { }); }); - - //this is only a workaround to ensure it works with all browers behind a proxy - //we should remove this when the new socket.io version is more stable - io.set('transports', ['xhr-polling']); + // 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']); var socketIOLogger = log4js.getLogger("socket.io"); io.set('logger', { |