From e0edb71a8ab2f23eaebf5c7557d5d1d19bb55baa Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Thu, 25 Dec 2014 14:13:54 -0500
Subject: [PATCH] use socket.io default and ["polling", "websocket"]

---
 src/controllers/api.js | 2 +-
 src/socket.io/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/controllers/api.js b/src/controllers/api.js
index 6001067eca..2648f944b4 100644
--- a/src/controllers/api.js
+++ b/src/controllers/api.js
@@ -13,7 +13,7 @@ var apiController = {};
 apiController.getConfig = function(req, res, next) {
 	var config = {};
 	config.relative_path = nconf.get('relative_path');
-	config.socketioTransports = nconf.get('socket.io:transports') || ['websocket', 'polling'];
+	config.socketioTransports = nconf.get('socket.io:transports') || ['polling', 'websocket'];
 	config.websocketAddress = nconf.get('socket.io:address') || '';
 	config.version = pkg.version;
 	config.siteTitle = meta.config.title || meta.config.browserTitle || 'NodeBB';
diff --git a/src/socket.io/index.js b/src/socket.io/index.js
index 5853d122f2..7faca188ab 100644
--- a/src/socket.io/index.js
+++ b/src/socket.io/index.js
@@ -33,7 +33,7 @@ Sockets.init = function(server) {
 	io.on('connection', onConnection);
 
 	io.listen(server, {
-		transports: nconf.get('socket.io:transports') || ['websocket', 'polling']
+		transports: nconf.get('socket.io:transports')
 	});
 
 	Sockets.server = io;