From 7cb0e4a9a95886300268e1bff1e72b4c18f1b762 Mon Sep 17 00:00:00 2001 From: Christian Beier Date: Wed, 9 Nov 2011 19:20:10 +0100 Subject: [PATCH] novnc client: use the client's notion about the server hostname instead of what the server thinks. --- classes/index.vnc | 15 ++++++++++++++- libvncserver/httpd.c | 4 ---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/classes/index.vnc b/classes/index.vnc index 1a05d01..34ad25d 100644 --- a/classes/index.vnc +++ b/classes/index.vnc @@ -5,9 +5,11 @@ signs ($$) to get a dollar sign in the generated html. --> + $USER's $DESKTOP desktop ($DISPLAY) + @@ -15,8 +17,19 @@ $USER's $DESKTOP desktop ($DISPLAY)

+ If the above Java applet does not work, you can also try the new JavaScript-only noVNC viewer. You will need a HTML5-capable browser though. -Click here to connect using noVNC. + +
+ +
+


diff --git a/libvncserver/httpd.c b/libvncserver/httpd.c index 3252fc6..3025aae 100644 --- 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));