diff options
| author | runge <runge> | 2007-03-20 23:33:04 +0000 |
|---|---|---|
| committer | runge <runge> | 2007-03-20 23:33:04 +0000 |
| commit | 5e4546628cbd6a450fa7eeea67c1434269cf6154 (patch) | |
| tree | f8fe8c0e842ba4f686ae15f6187fe62680d7c9fd /x11vnc/x11vnc.c | |
| parent | f57eb8742f69fa49e487379affe93ba14cef3dc3 (diff) | |
| download | libtdevnc-5e4546628cbd6a450fa7eeea67c1434269cf6154.tar.gz libtdevnc-5e4546628cbd6a450fa7eeea67c1434269cf6154.zip | |
x11vnc: -httpsredir, x11cursor fix, nc=N login opt, no -ncache betatest for java viewer.
Diffstat (limited to 'x11vnc/x11vnc.c')
| -rw-r--r-- | x11vnc/x11vnc.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/x11vnc/x11vnc.c b/x11vnc/x11vnc.c index 5c0dc02..6dcf579 100644 --- a/x11vnc/x11vnc.c +++ b/x11vnc/x11vnc.c @@ -1983,6 +1983,15 @@ int main(int argc, char* argv[]) { i++; } } + } else if (!strcmp(arg, "-httpsredir")) { + https_port_redir = -1; + if (i < argc-1) { + char *s = argv[i+1]; + if (s[0] != '-') { + https_port_redir = atoi(s); + i++; + } + } #endif } else if (!strcmp(arg, "-nopw")) { nopw = 1; @@ -3069,6 +3078,10 @@ int main(int argc, char* argv[]) { if (ncache < 0) { ncache_beta_tester = 1; ncache = -ncache; + if (try_http || got_httpdir) { + /* JVM usually not set to handle all the memory */ + ncache = 0; + } } if (raw_fb_str) { |