mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-05 06:37:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 95f1992e4d into ecd486e440

Browse source
This commit is contained in:
GitHub Merge Button 2011-09-14 03:37:35 -07:00
commit 928f91c7f7
4 changed files with 44 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
node/server.js
View file

@ -420,6 +420,8 @@ 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('polling duration', settings.pollingDuration)
var socketIOLogger = log4js.getLogger("socket.io");
io.set('logger', {