From e83b9e03ebecf6da7e3d7641d2d92a838353a328 Mon Sep 17 00:00:00 2001
From: Will Rouesnel <w.rouesnel@gmail.com>
Date: Sat, 13 Apr 2013 18:45:56 +1000
Subject: [PATCH] Detect port properly in vnc_auto.html when used on port 80 or
 443.

Browsers (such as Chrome) don't report port numbers in window.location.port when
used on standard ports such as 80 and 443. This causes vnc_auto.html to not
automatically find the port as it should.

This simple change checks if window.location.port is blank, and sets port as
appropriate from the name of the protocol in use.
---
 vnc_auto.html | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/vnc_auto.html b/vnc_auto.html
index 064b3899..d8eb0a5a 100644
--- a/vnc_auto.html
+++ b/vnc_auto.html
@@ -122,6 +122,17 @@
             host = WebUtil.getQueryVar('host', window.location.hostname);
             port = WebUtil.getQueryVar('port', window.location.port);
 
+            // 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') {            
+                    port = 443;
+                }
+            }
+
             // If a token variable is passed in, set the parameter in a cookie.
             // This is used by nova-novncproxy.
             token = WebUtil.getQueryVar('token', null);