x11vnc: -httpsredir, x11cursor fix, nc=N login opt, no -ncache betatest for java viewer.

1 files changed, 31 insertions, 11 deletions

diff --git a/x11vnc/help.c b/x11vnc/help.c
index 0cb7beb..bc38787 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -1442,6 +1442,26 @@ void print_help(int mode) {
 "                       -httpdir option.  If not supplied it will try to guess\n"
 "                       the directory as though the -http option was supplied.\n"
 "\n"
+"-httpsredir [port]     In -ssl mode with the Java applet retrieved via HTTPS:\n"
+"                       when the HTML file containing applet parameters\n"
+"                       ('index.vnc' or 'proxy.vnc') is sent do not set the\n"
+"                       applet PORT parameter to the actual VNC port but set it\n"
+"                       to \"port\" instead.  If \"port\" is not supplied, then\n"
+"                       the port number is guessed from the Host: HTTP header.\n"
+"\n"
+"                       This is useful when an incoming TCP connection\n"
+"                       redirection is performed by a router/gateway/firewall\n"
+"                       from one port to an internal machine where x11vnc is\n"
+"                       listening on a different port. The Java applet needs to\n"
+"                       connect to the firewall/router port, not the VNC port\n"
+"                       on the internal workstation. For example, one could\n"
+"                       redir from mygateway.com:443 to workstation:5900.\n"
+"\n"
+"                       This spares the user from having to type in\n"
+"                       https://mygateway.com/?PORT=443 into their web browser\n"
+"                       (note 443 is the default https port; other ports must\n"
+"                       be explicity indicated: https://mygateway.com:8000/...)\n"
+"\n"
 #endif
 "-usepw                 If no other password method was supplied on the command\n"
 "                       line, first look for ~/.vnc/passwd and if found use it\n"
@@ -3784,17 +3804,17 @@ void print_help(int mode) {
 "                       http_url auth xauth users rootshift clipshift\n"
 "                       scale_str scaled_x scaled_y scale_numer scale_denom\n"
 "                       scale_fac scaling_blend scaling_nomult4 scaling_pad\n"
-"                       scaling_interpolate inetd privremote unsafe safer nocmds\n"
-"                       passwdfile unixpw unixpw_nis unixpw_list ssl ssl_pem\n"
-"                       sslverify stunnel stunnel_pem https usepw using_shm\n"
-"                       logfile o flag rc norc h help V version lastmod bg\n"
-"                       sigpipe threads readrate netrate netlatency pipeinput\n"
-"                       clients client_count pid ext_xtest ext_xtrap ext_xrecord\n"
-"                       ext_xkb ext_xshm ext_xinerama ext_overlay ext_xfixes\n"
-"                       ext_xdamage ext_xrandr rootwin num_buttons button_mask\n"
-"                       mouse_x mouse_y bpp depth indexed_color dpy_x dpy_y\n"
-"                       wdpy_x wdpy_y off_x off_y cdpy_x cdpy_y coff_x coff_y\n"
-"                       rfbauth passwd viewpasswd\n"
+"                       scaling_interpolate inetd privremote unsafe safer\n"
+"                       nocmds passwdfile unixpw unixpw_nis unixpw_list ssl\n"
+"                       ssl_pem sslverify stunnel stunnel_pem https httpsredir\n"
+"                       usepw using_shm logfile o flag rc norc h help V version\n"
+"                       lastmod bg sigpipe threads readrate netrate netlatency\n"
+"                       pipeinput clients client_count pid ext_xtest ext_xtrap\n"
+"                       ext_xrecord ext_xkb ext_xshm ext_xinerama ext_overlay\n"
+"                       ext_xfixes ext_xdamage ext_xrandr rootwin num_buttons\n"
+"                       button_mask mouse_x mouse_y bpp depth indexed_color\n"
+"                       dpy_x dpy_y wdpy_x wdpy_y off_x off_y cdpy_x cdpy_y\n"
+"                       coff_x coff_y rfbauth passwd viewpasswd\n"
 "\n"
 "\n"
 "-QD variable           Just like -query variable, but returns the default\n"