novnc client: use the client's notion about the server hostname instead of what the server thinks.

7cb0e4a9 · Christian Beier · 4d346423 · 7cb0e4a9 · 7cb0e4a9
Commit 7cb0e4a9 authored Nov 09, 2011 by Christian Beier
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 5 deletions

index.vnc classes/index.vnc +14 -1

httpd.c libvncserver/httpd.c +0 -4

No files found.
--- a/classes/index.vnc
+++ b/classes/index.vnc
@@ -5,9 +5,11 @@
     signs ($$) to get a dollar sign in the generated html. -->

 <HTML>
+<head> 
 <TITLE>
 $USER's $DESKTOP desktop ($DISPLAY)
 </TITLE>
+</head> 
 <APPLET CODE=VncViewer.class ARCHIVE=VncViewer.jar
        WIDTH=$APPLETWIDTH HEIGHT=$APPLETHEIGHT>
 <param name=PORT value=$PORT>
@@ -15,8 +17,19 @@ $USER's $DESKTOP desktop ($DISPLAY)
 </APPLET>
 <br/>
 <br/>
+
 If the above Java applet does not work, you can also try the new JavaScript-only <a href="http://kanaka.github.com/noVNC/">noVNC</a> viewer. You will need a HTML5-capable browser though.
-<a href="novnc/vnc_auto.html?host=$HOST&port=$PORT&true_color=1">Click here to connect using noVNC.</a>
+<script language="JavaScript">
+    <!--
+    function start_novnc(){
+	 open("novnc/vnc_auto.html?host=" + document.location.hostname + "&port=$PORT&true_color=1");
+    }
+    -->
+</script>
+<form name="novnc_button_form">
+  <input type="button" name="novnc_button" value="Click here to connect using noVNC" onClick='start_novnc()'>
+</form>
+
 <br/>
 <br/>
 <br/>

--- a/libvncserver/httpd.c
+++ b/libvncserver/httpd.c
@@ -431,10 +431,6 @@ httpProcessInput(rfbScreenInfoPtr rfbScreen)
 		    sprintf(str, "%d", rfbScreen->port);
 		    rfbWriteExact(&cl, str, strlen(str));

-		} else if (compareAndSkip(&ptr, "$HOST")) {
-
-		    rfbWriteExact(&cl, rfbScreen->thisHost, strlen(rfbScreen->thisHost));
-
 		} else if (compareAndSkip(&ptr, "$DESKTOP")) {

 		    rfbWriteExact(&cl, rfbScreen->desktopName, strlen(rfbScreen->desktopName));