vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #1282 from bohlian/develop

Browse source 
Enable secure socket connection when using HTTPS
This commit is contained in:
Rushabh Mehta 2015-10-13 13:46:12 +05:30
commit de36f549e5
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
frappe/public/js/frappe/socket.js
View file

@ -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());