add socketTransportProtocols parameter

pull/1244/head
Wikinaut 2012-12-02 18:28:28 +01:00
parent e9e4d65ad4
commit 8b044254cc
3 changed files with 17 additions and 2 deletions

View File

@ -29,6 +29,13 @@
*/ */
// restricts socket.io transport methods to JSONP-POLLING only
// which is needed for IE8 browsers with deactivated native XMLHTTP support
// see issue https://github.com/ether/etherpad-lite/pull/958
// and https://github.com/ether/etherpad-lite/issues/245#issuecomment-4013455
"socketTransportProtocols" : ['xhr-polling', 'jsonp-polling', 'htmlfile'],
//The Type of the database. You can choose between dirty, postgres, sqlite and mysql //The Type of the database. You can choose between dirty, postgres, sqlite and mysql
//You shouldn't use "dirty" for for anything else than testing or development //You shouldn't use "dirty" for for anything else than testing or development
"dbType" : "dirty", "dbType" : "dirty",

View File

@ -36,10 +36,10 @@ exports.expressCreateServer = function (hook_name, args, cb) {
}); });
}); });
// there shouldn#t be a browser that isn't compatible to all // there shouldn't be a browser that isn't compatible to all
// transports in this list at once // transports in this list at once
// e.g. XHR is disabled in IE by default, so in IE it should use jsonp-polling // 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']); io.set('transports', settings.socketTransportProtocols );
var socketIOLogger = log4js.getLogger("socket.io"); var socketIOLogger = log4js.getLogger("socket.io");
io.set('logger', { io.set('logger', {

View File

@ -57,6 +57,14 @@ exports.port = process.env.PORT || 9001;
*/ */
exports.ssl = false; exports.ssl = false;
/**
* restricts socket.io transport methods to JSONP-POLLING only
* which is needed for IE8 browsers with deactivated native XMLHTTP support
* see issue https://github.com/ether/etherpad-lite/pull/958
* and https://github.com/ether/etherpad-lite/issues/245#issuecomment-4013455
**/
exports.socketTransportProtocols = ['xhr-polling', 'jsonp-polling', 'htmlfile'];
/* /*
* The Type of the database * The Type of the database
*/ */