From a4c00663ffc28f4dbf4cb6ef3e064bf0a8f8f7b5 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Thu, 23 Feb 2017 13:13:59 -0500
Subject: [PATCH] Revert "adding origin to new local ioConfig var, as per
 @barisusakli, re: #5472"

This reverts commit c1b1ff5c6ec5a35ed1e127edc5ccfc06dd04c5c2.
---
 src/socket.io/index.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/socket.io/index.js b/src/socket.io/index.js
index 318831d0fb..58f12ea374 100644
--- a/src/socket.io/index.js
+++ b/src/socket.io/index.js
@@ -22,10 +22,6 @@ 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'
 	});
@@ -51,15 +47,17 @@ Sockets.init = function (server) {
 		}
 
 		if (!override) {
-			ioConfig.origins = parsedUrl.protocol + '//' + domain + ':*';
+			io.set('origins', parsedUrl.protocol + '//' + domain + ':*');
 			winston.info('[socket.io] Restricting access to origin: ' + parsedUrl.protocol + '//' + domain + ':*');
 		} else {
-			ioConfig.origins = override;
+			io.set('origins', 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;
 };