From 2ba5cdb454fa2d7720015e24cd02e1d21c642bad Mon Sep 17 00:00:00 2001
From: Ryan Lovett <rylo@berkeley.edu>
Date: Wed, 18 Apr 2018 17:07:44 -0700
Subject: [PATCH] Prefix websocket path with server path

If noVNC is not served at the root path, prefix the websocket path with the server path.  This makes the path to the websocket consistent with the path to all the other web assets. This is convenient so that users do not need to manually change the path setting, though they still can override it.
For example if the noVNC server is at /some/sub/dir, with this patch noVNC will connect to /some/sub/dir/websockify rather than /websockify.
---
 vnc_lite.html | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/vnc_lite.html b/vnc_lite.html
index 4a96d448..e3aea394 100644
--- a/vnc_lite.html
+++ b/vnc_lite.html
@@ -187,6 +187,20 @@
         }
 
         var password = WebUtil.getConfigVar('password', '');
+        
+        var defaultPath = 'websockify';
+        // If noVNC is not being served at the root path,
+        // prefix the default websocket path with the server path.
+        var pathName = window.location.pathname.slice(1);
+        if (pathName.length != 0) { // We are not at the root path
+            if (pathName.slice(-1) == '/') {
+                // There's a trailing slash.
+                defaultPath = pathName + 'websockify';            
+            } else {
+                // There's no trailing slash.
+                defaultPath = pathName + '/websockify';
+            }
+        }
         var path = WebUtil.getConfigVar('path', 'websockify');
 
         // If a token variable is passed in, set the parameter in a cookie.