Merge branch 'master' into develop

This commit is contained in:
Julian Lam
2017-02-23 13:57:46 -05:00
8 changed files with 147 additions and 107 deletions

View File

@@ -47,10 +47,10 @@ Sockets.init = function (server) {
}
if (!override) {
io.set('origins', parsedUrl.protocol + '//' + domain + ':*');
io.origins(parsedUrl.protocol + '//' + domain + ':*');
winston.info('[socket.io] Restricting access to origin: ' + parsedUrl.protocol + '//' + domain + ':*');
} else {
io.set('origins', override);
io.origins(override);
winston.info('[socket.io] Restricting access to origin: ' + override);
}
}