From c1b1ff5c6ec5a35ed1e127edc5ccfc06dd04c5c2 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 23 Feb 2017 12:46:59 -0500 Subject: [PATCH] adding origin to new local ioConfig var, as per @barisusakli, re: #5472 --- src/socket.io/index.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/socket.io/index.js b/src/socket.io/index.js index f4732d9d9e..4ddf638e9e 100644 --- a/src/socket.io/index.js +++ b/src/socket.io/index.js @@ -22,6 +22,10 @@ Sockets.init = function (server) { var SocketIO = require('socket.io'); var socketioWildcard = require('socketio-wildcard')(); + var ioConfig = { + transports: nconf.get('socket.io:transports') + }; + io = new SocketIO({ path: nconf.get('relative_path') + '/socket.io' }); @@ -47,17 +51,15 @@ Sockets.init = function (server) { } if (!override) { - io.set('origins', parsedUrl.protocol + '//' + domain + ':*'); + ioConfig.origins = parsedUrl.protocol + '//' + domain + ':*'; winston.info('[socket.io] Restricting access to origin: ' + parsedUrl.protocol + '//' + domain + ':*'); } else { - io.set('origins', override); + ioConfig.origins = override; winston.info('[socket.io] Restricting access to origin: ' + override); } } - io.listen(server, { - transports: nconf.get('socket.io:transports') - }); + io.listen(server, ioConfig); Sockets.server = io; };