From 7bbdfe5e129b31e4d6d9e0c52734a183c62c2247 Mon Sep 17 00:00:00 2001 From: bohlian Date: Mon, 31 Aug 2015 13:51:07 +0800 Subject: [PATCH] Enable secure socket connection when using HTTPS --- frappe/public/js/frappe/socket.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/socket.js b/frappe/public/js/frappe/socket.js index 511cf28e68..e139c5dd5e 100644 --- a/frappe/public/js/frappe/socket.js +++ b/frappe/public/js/frappe/socket.js @@ -6,7 +6,13 @@ frappe.socket = { return; } - frappe.socket.socket = io.connect(frappe.socket.get_host()); + //Enable secure option when using HTTPS + if (window.location.protocol == "https:") { + frappe.socket.socket = io.connect(frappe.socket.get_host(), {secure: true}); + } + else if (window.location.protocol == "http:") { + frappe.socket.socket = io.connect(frappe.socket.get_host()); + } if (!frappe.socket.socket) { console.log("Unable to connect to " + frappe.socket.get_host());