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

pull/1/head
Christian Beier 11 years ago
parent 4d3464236b
commit 7cb0e4a9a9

@ -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/>

@ -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));

Loading…
Cancel
Save