summaryrefslogtreecommitdiffstats
path: root/x11vnc/remote.c
diff options
context:
space:
mode:
authorrunge <runge@karlrunge.com>2010-04-18 19:37:37 -0400
committerrunge <runge@karlrunge.com>2010-04-18 19:37:37 -0400
commitb74c8f4241ec8c3d972ee97d0ce9a399ddd09ce1 (patch)
treec8c8aaec90fd51a10790795030777b2dda548fe7 /x11vnc/remote.c
parent2a8ba97ec5b0f7fbfcfc8adab6732a95e95c7204 (diff)
downloadlibtdevnc-b74c8f4241ec8c3d972ee97d0ce9a399ddd09ce1.tar.gz
libtdevnc-b74c8f4241ec8c3d972ee97d0ce9a399ddd09ce1.zip
Improvements to demo scripts. Alias -coe for -connect_or_exit. Fix HAVE_V4L2. Warn no Xvfb, Xdummy, or Xvnc. Xinerama screens.
Diffstat (limited to 'x11vnc/remote.c')
-rw-r--r--x11vnc/remote.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/x11vnc/remote.c b/x11vnc/remote.c
index 6c9ae42..2a45d8b 100644
--- a/x11vnc/remote.c
+++ b/x11vnc/remote.c
@@ -516,8 +516,16 @@ void http_connections(int on) {
screen->httpInitDone = FALSE;
if (check_httpdir()) {
int fd6 = -1;
+ char *save = listen_str6;
+
screen->httpDir = http_dir;
+
rfb_http_init_sockets();
+
+ if (getenv("X11VNC_HTTP_LISTEN_LOCALHOST")) {
+ listen_str6 = "localhost";
+ }
+
if (screen->httpPort != 0 && screen->httpListenSock < 0) {
rfbLog("http_connections: failed to listen on http port: %d\n", screen->httpPort);
if (ipv6_listen) {
@@ -534,11 +542,12 @@ void http_connections(int on) {
}
ipv6_http_fd = fd6;
if (ipv6_http_fd >= 0) {
- rfbLog("http_connections: %s listening on IPv6 port=%d sock=%d\n",
- screen->httpListenSock < 0 ? "Only" : "Also",
+ rfbLog("http_connections: Listening %s on IPv6 port %d (socket %d)\n",
+ screen->httpListenSock < 0 ? "only" : "also",
screen->httpPort, ipv6_http_fd);
}
}
+ listen_str6 = save;
}
} else {
rfbLog("http_connections: turning off http service.\n");