diff options
| author | runge <runge> | 2006-06-13 02:35:28 +0000 |
|---|---|---|
| committer | runge <runge> | 2006-06-13 02:35:28 +0000 |
| commit | 06a401f8f81b1fcf94bce6c99e4823d6e697881c (patch) | |
| tree | a975775f83fae8e7f5351ddc1f12384278f27660 /x11vnc/remote.c | |
| parent | 7a3e236390501c14b9d75d80ea88f8a3e69a337a (diff) | |
| download | libvncserver-06a401f8f81b1fcf94bce6c99e4823d6e697881c.zip libvncserver-06a401f8f81b1fcf94bce6c99e4823d6e697881c.tar.gz | |
x11vnc: -display WAIT:cmd=FINDDISPLAY, HTTPONCE, -http_ssl option, Java fixes.
Diffstat (limited to 'x11vnc/remote.c')
| -rw-r--r-- | x11vnc/remote.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/x11vnc/remote.c b/x11vnc/remote.c index 0716a81..b68e9b1 100644 --- a/x11vnc/remote.c +++ b/x11vnc/remote.c @@ -268,7 +268,7 @@ void check_black_fb(void) { } int check_httpdir(void) { - if (http_dir) { + if (http_dir && http_dir[0] != '\0') { return 1; } else { char *prog = NULL, *httpdir, *q; @@ -324,7 +324,7 @@ int check_httpdir(void) { len = strlen(prog) + 21 + 1; *q = '\0'; httpdir = (char *) malloc(len); - if (use_openssl || use_stunnel) { + if (use_openssl || use_stunnel || http_ssl) { snprintf(httpdir, len, "%s/../share/x11vnc/classes/ssl", prog); } else { snprintf(httpdir, len, "%s/../share/x11vnc/classes", prog); @@ -351,7 +351,7 @@ int check_httpdir(void) { "/usr/share/x11vnc/classes/ssl", NULL }; - if (use_openssl || use_stunnel) { + if (use_openssl || use_stunnel || http_ssl) { use = ssllist; } else { use = list; @@ -392,8 +392,8 @@ void http_connections(int on) { } } screen->httpInitDone = FALSE; - screen->httpDir = http_dir; if (check_httpdir()) { + screen->httpDir = http_dir; rfbHttpInitSockets(screen); } } else { |
