From 2c75c394d3e31e697f6c593d1ef15baa36c2bdb3 Mon Sep 17 00:00:00 2001 From: Aleksandr Zykov Date: Thu, 7 May 2015 08:31:28 +0200 Subject: [PATCH 1/2] Proper https support --- src/Ui/media/all.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Ui/media/all.js b/src/Ui/media/all.js index 0dd62f37..3bddd5dd 100644 --- a/src/Ui/media/all.js +++ b/src/Ui/media/all.js @@ -1173,11 +1173,15 @@ jQuery.extend( jQuery.easing, })(); - if (window.server_url) { - ws_url = "ws://" + (window.server_url.replace('http://', '')) + "/Websocket?wrapper_key=" + window.wrapper_key; + var origin = window.server_url || window.location.origin; + var proto; + if (origin.indexOf('https:') === 0) { + proto = { ws: 'wss', ht: 'https' }; } else { - ws_url = "ws://" + window.location.hostname + ":" + window.location.port + "/Websocket?wrapper_key=" + window.wrapper_key; + proto = { ws: 'ws', ht: 'http' }; } + console.log(origin, proto) + ws_url = proto.ws + ":" + (origin.replace(proto.ht + ':', '')) + "/Websocket?wrapper_key=" + window.wrapper_key; window.wrapper = new Wrapper(ws_url); From 52b8e4984eeeb3f738af307d2c9e1a5e8753ff6a Mon Sep 17 00:00:00 2001 From: Aleksandr Zykov Date: Thu, 7 May 2015 08:35:06 +0200 Subject: [PATCH 2/2] Some debugging code has been removed --- src/Ui/media/all.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Ui/media/all.js b/src/Ui/media/all.js index 3bddd5dd..f0ad9b2b 100644 --- a/src/Ui/media/all.js +++ b/src/Ui/media/all.js @@ -1180,7 +1180,6 @@ jQuery.extend( jQuery.easing, } else { proto = { ws: 'ws', ht: 'http' }; } - console.log(origin, proto) ws_url = proto.ws + ":" + (origin.replace(proto.ht + ':', '')) + "/Websocket?wrapper_key=" + window.wrapper_key; window.wrapper = new Wrapper(ws_url);