From eb955f8c20b64991e90b2b6f04148a98f1fb9321 Mon Sep 17 00:00:00 2001 From: John Dewey Date: Sat, 21 Sep 2013 12:19:09 -0700 Subject: [PATCH 1/2] The https check should come first A similar change was made to ui.js in #252. --- vnc_auto.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vnc_auto.html b/vnc_auto.html index 2aa21889..bd905ffa 100644 --- a/vnc_auto.html +++ b/vnc_auto.html @@ -128,12 +128,12 @@ // if port == 80 (or 443) then it won't be present and should be // set manually if (!port) { - if (window.location.protocol.substring(0,4) == 'http') { - port = 80; - } - else if (window.location.protocol.substring(0,5) == 'https') { + if (window.location.protocol.substring(0,5) == 'https') { port = 443; } + else if (window.location.protocol.substring(0,4) == 'http') { + port = 80; + } } // If a token variable is passed in, set the parameter in a cookie. From 82744aa8ee760520dafad8a3bd299879927d3398 Mon Sep 17 00:00:00 2001 From: John Dewey Date: Sat, 21 Sep 2013 12:19:59 -0700 Subject: [PATCH 2/2] Removed trailing white space terds --- vnc_auto.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vnc_auto.html b/vnc_auto.html index bd905ffa..7704bf69 100644 --- a/vnc_auto.html +++ b/vnc_auto.html @@ -2,7 +2,7 @@ -