From 8d7283e6c7b1f74c9fefd7eb369dcf07388137d6 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Wed, 15 Mar 2017 20:33:33 +0300
Subject: [PATCH 1/2] dont minify if file ends with .min.js #5529

---
 src/meta/js.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/meta/js.js b/src/meta/js.js
index a39caf5919..72e41c578f 100644
--- a/src/meta/js.js
+++ b/src/meta/js.js
@@ -108,6 +108,12 @@ module.exports = function (Meta) {
 						if (err) {
 							return cb(err);
 						}
+
+						if (filePath.endsWith('.min.js')) {
+							minified = { code: buffer.toString() };
+							return cb();
+						}
+
 						try {
 							minified = uglifyjs.minify(buffer.toString(), {
 								fromString: true,

From 33bf930bb90579c4a1b6fe9a0221247db0959306 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Wed, 15 Mar 2017 13:49:35 -0400
Subject: [PATCH 2/2] fixes #5528

---
 src/socket.io/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/socket.io/index.js b/src/socket.io/index.js
index 253f5628e1..ccabf242fa 100644
--- a/src/socket.io/index.js
+++ b/src/socket.io/index.js
@@ -174,7 +174,7 @@ function checkMaintenance(socket, callback) {
 function validateSession(socket, callback) {
 	var req = socket.request;
 	if (!req.signedCookies || !req.signedCookies[nconf.get('sessionKey')]) {
-		return callback(new Error('[[error:invalid-session]]'));
+		return callback();
 	}
 	db.sessionStore.get(req.signedCookies[nconf.get('sessionKey')], function (err, sessionData) {
 		if (err || !sessionData) {