Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-15 18:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "adding origin to new local ioConfig var, as per @barisusakli, re: #5472"

Browse Source 
This reverts commit c1b1ff5c6e.
This commit is contained in:
Julian Lam
2017-02-23 13:13:59 -05:00
parent 8154e29ad5
commit a4c00663ff
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/socket.io/index.js
View File

@@ -22,10 +22,6 @@ Sockets.init = function (server) {
var SocketIO = require('socket.io'); var SocketIO = require('socket.io');
var socketioWildcard = require('socketio-wildcard')(); var socketioWildcard = require('socketio-wildcard')();
var ioConfig = {
transports: nconf.get('socket.io:transports')
};
io = new SocketIO({ io = new SocketIO({
path: nconf.get('relative_path') + '/socket.io' path: nconf.get('relative_path') + '/socket.io'
}); });
@@ -51,15 +47,17 @@ Sockets.init = function (server) {
} }
if (!override) { if (!override) {
ioConfig.origins = parsedUrl.protocol + '//' + domain + ':*'; io.set('origins', parsedUrl.protocol + '//' + domain + ':*');
winston.info('[socket.io] Restricting access to origin: ' + parsedUrl.protocol + '//' + domain + ':*'); winston.info('[socket.io] Restricting access to origin: ' + parsedUrl.protocol + '//' + domain + ':*');
} else { } else {
ioConfig.origins = override; io.set('origins', override);
winston.info('[socket.io] Restricting access to origin: ' + override); winston.info('[socket.io] Restricting access to origin: ' + override);
} }
} }
io.listen(server, ioConfig); io.listen(server, {
transports: nconf.get('socket.io:transports')
});
Sockets.server = io; Sockets.server = io;
}; };