mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fixed git merge confict

Browse source
This commit is contained in:
Iván Eixarch 2012-12-03 01:39:59 +01:00
commit 657322db91
34 changed files with 1193 additions and 254 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/node/hooks/express.js
View file

@ -66,8 +66,6 @@ exports.restartServer = function () {
} else {
console.log( "SSL -- not enabled!" );
var http = require('http');
server = http.createServer(app);
}

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
// 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', {