summaryrefslogtreecommitdiffstats
path: root/x11vnc/screen.c
diff options
context:
space:
mode:
authorrunge <runge@karlrunge.com>2009-12-07 09:15:22 -0500
committerrunge <runge@karlrunge.com>2009-12-07 09:15:22 -0500
commit8f5c9ef01ef9101cf8f8d8f1eacdaab27ac7c2c8 (patch)
treeb56c0f6b003075bffc43cae033c647ab31eeff60 /x11vnc/screen.c
parent6153bd69835da0e7217ae844bdba4e2ba676f981 (diff)
downloadlibtdevnc-8f5c9ef01ef9101cf8f8d8f1eacdaab27ac7c2c8.tar.gz
libtdevnc-8f5c9ef01ef9101cf8f8d8f1eacdaab27ac7c2c8.zip
X11VNC_EXTRA_HTTPS_PARAMS, X11VNC_HTTP_LISTEN_LOCALHOST, X11VNC_REOPEN_SLEEP_MAX,
-findauth/-auth guess FD_XDM=1 for root, work around xhost SI:localuser:root.
Diffstat (limited to 'x11vnc/screen.c')
-rw-r--r--x11vnc/screen.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/x11vnc/screen.c b/x11vnc/screen.c
index b34a941..f1f4ced 100644
--- a/x11vnc/screen.c
+++ b/x11vnc/screen.c
@@ -3681,20 +3681,27 @@ static void announce_http(int lport, int ssl, char *iface, char *extra) {
char *host = this_host();
char *jvu;
+ int http = 0;
if (enc_str && !strcmp(enc_str, "none") && !use_stunnel) {
jvu = "Java viewer URL: http";
+ http = 1;
} else if (ssl == 1) {
jvu = "Java SSL viewer URL: https";
} else if (ssl == 2) {
jvu = "Java SSL viewer URL: http";
+ http = 1;
} else {
jvu = "Java viewer URL: http";
+ http = 1;
}
if (iface != NULL && *iface != '\0' && strcmp(iface, "any")) {
host = iface;
}
+ if (http && getenv("X11VNC_HTTP_LISTEN_LOCALHOST")) {
+ host = "localhost";
+ }
if (host != NULL) {
if (! inetd) {
fprintf(stderr, "%s://%s:%d/%s\n", jvu, host, lport, extra);
@@ -3763,7 +3770,8 @@ void do_mention_java_urls(void) {
rfbLog("Where you replace \"host:port\" with that printed below, or\n");
rfbLog("whatever is needed to reach the host e.g. Internet IP number\n");
rfbLog("\n");
- rfbLog("Append ?GET=1 to a URL for faster loading.\n");
+ rfbLog("Append ?GET=1 to a URL for faster loading or supply:\n");
+ rfbLog("-env X11VNC_EXTRA_HTTPS_PARAMS='?GET=1' to cmdline.\n");
}
}
rfbLog("\n");