diff options
| author | John McLear <john@mclear.co.uk> | 2011-11-25 10:47:12 -0800 |
|---|---|---|
| committer | John McLear <john@mclear.co.uk> | 2011-11-25 10:47:12 -0800 |
| commit | f61de98046bc043ef48a452bbd1b9c3652e07864 (patch) | |
| tree | ae6905248f37109ac5216406d01533204d8ecf0a /node/server.js | |
| parent | 40fcc83a053a4831e200a3897140349da144a5cf (diff) | |
| parent | 97e9eb84afd2f3f712330386ec0af547891e69aa (diff) | |
| download | etherpad-lite-f61de98046bc043ef48a452bbd1b9c3652e07864.zip | |
Merge pull request #232 from riseuplabs/master
Temp fix, @Pita may revert this. For now it gets things stable again
Diffstat (limited to 'node/server.js')
| -rw-r--r-- | node/server.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node/server.js b/node/server.js index 1e0b6283..08c09ab0 100644 --- a/node/server.js +++ b/node/server.js @@ -436,7 +436,7 @@ async.waterfall([ //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']); + io.set('transports', ['xhr-polling']); var socketIOLogger = log4js.getLogger("socket.io"); io.set('logger', { |