libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-19 14:13:34 +01:00
Code Issues Projects Releases Wiki Activity

add socketTransportProtocols parameter

Browse source
This commit is contained in:
Wikinaut 2012-12-02 18:28:28 +01:00
parent e9e4d65ad4
commit 8b044254cc
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
settings.json.template
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
//You shouldn't use "dirty" for for anything else than testing or development
"dbType" : "dirty",

4
src/node/hooks/express/socketio.js
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
// 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");
io.set('logger', {

8
src/node/utils/Settings.js
View file

@ -57,6 +57,14 @@ exports.port = process.env.PORT || 9001;
*/
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
*/