From 7cbaa90d36e249bc6b2406e37a045c24881eed9b Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Mon, 24 Nov 2014 13:44:59 -0500
Subject: [PATCH] update to socket.io 1.2.1, return_buffers option

---
 package.json           | 4 ++--
 src/database/redis.js  | 8 +++++---
 src/socket.io/index.js | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index c62a8b3828..ba878033db 100644
--- a/package.json
+++ b/package.json
@@ -54,8 +54,8 @@
     "semver": "^4.0.3",
     "serve-favicon": "^2.1.5",
     "sitemap": "^0.7.4",
-    "socket.io": "^1.2.0",
-    "socket.io-client": "^1.2.0",
+    "socket.io": "^1.2.1",
+    "socket.io-client": "^1.2.1",
     "socket.io-redis": "^0.1.3",
     "socketio-wildcard": "~0.1.1",
     "string": "^2.1.0",
diff --git a/src/database/redis.js b/src/database/redis.js
index f7928baf7c..727705c130 100644
--- a/src/database/redis.js
+++ b/src/database/redis.js
@@ -74,20 +74,22 @@
 		}
 	};
 
-	module.connect = function() {
+	module.connect = function(options) {
 		var redis_socket_or_host = nconf.get('redis:host'),
 			cxn, dbIdx;
 
+		options = options || {};
+
 		if (!redis) {
 			redis = require('redis');
 		}
 
 		if (redis_socket_or_host && redis_socket_or_host.indexOf('/') >= 0) {
 			/* If redis.host contains a path name character, use the unix dom sock connection. ie, /tmp/redis.sock */
-			cxn = redis.createClient(nconf.get('redis:host'));
+			cxn = redis.createClient(nconf.get('redis:host'), options);
 		} else {
 			/* Else, connect over tcp/ip */
-			cxn = redis.createClient(nconf.get('redis:port'), nconf.get('redis:host'));
+			cxn = redis.createClient(nconf.get('redis:port'), nconf.get('redis:host'), options);
 		}
 
 		cxn.on('error', function (err) {
diff --git a/src/socket.io/index.js b/src/socket.io/index.js
index 8910c4a448..3915669234 100644
--- a/src/socket.io/index.js
+++ b/src/socket.io/index.js
@@ -233,8 +233,8 @@ function addRedisAdapter(io) {
 	if (nconf.get('redis')) {
 		var redisAdapter = require('socket.io-redis');
 		var redis = require('../database/redis');
-		var pub = redis.connect();
-		var sub = redis.connect();
+		var pub = redis.connect({return_buffers: true});
+		var sub = redis.connect({return_buffers: true});
 
 		io.adapter(redisAdapter({pubClient: pub, subClient: sub}));
 	} else {