diff options
| author | runge <runge@karlrunge.com> | 2009-12-18 23:38:28 -0500 |
|---|---|---|
| committer | runge <runge@karlrunge.com> | 2009-12-18 23:38:28 -0500 |
| commit | 95f709fa60acbf900bddc4284682e9dfcf314697 (patch) | |
| tree | 2904f1c11e356957440e3eb0f7ba80d71c045afb /x11vnc/sslhelper.c | |
| parent | 06987b1c0216429e6744bf5a2c306d0e6853f879 (diff) | |
| download | libtdevnc-95f709fa.tar.gz libtdevnc-95f709fa.zip | |
Add tag=... to unixpw opts to set FD_TAG. Prefer Xvfb over Xdummy.
Reduce wait time for https. Add 'Login succeeded' output to unixpw panel.
Diffstat (limited to 'x11vnc/sslhelper.c')
| -rw-r--r-- | x11vnc/sslhelper.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/x11vnc/sslhelper.c b/x11vnc/sslhelper.c index b36c7fd..42a5728 100644 --- a/x11vnc/sslhelper.c +++ b/x11vnc/sslhelper.c @@ -2919,7 +2919,7 @@ static int is_ssl_readable(int s_in, double last_https, char *last_get, * for each socket (and some clients send requests * rapid fire). */ - tv.tv_sec = 6; + tv.tv_sec = 4; } /* @@ -2935,14 +2935,16 @@ static int is_ssl_readable(int s_in, double last_https, char *last_get, if (getenv("X11VNC_HTTPS_VS_VNC_TIMEOUT")) { tv.tv_sec = atoi(getenv("X11VNC_HTTPS_VS_VNC_TIMEOUT")); } -if (db) fprintf(stderr, "tv_sec: %d - %s\n", (int) tv.tv_sec, last_get); +if (db) fprintf(stderr, "tv_sec: %d - '%s'\n", (int) tv.tv_sec, last_get); FD_ZERO(&rd); FD_SET(s_in, &rd); + if (db) fprintf(stderr, "is_ssl_readable: begin select(%d secs) %.6f\n", tv.tv_sec, dnow()); do { nfd = select(s_in+1, &rd, NULL, NULL, &tv); } while (nfd < 0 && errno == EINTR); + if (db) fprintf(stderr, "is_ssl_readable: finish select(%d secs) %.6f\n", tv.tv_sec, dnow()); if (db) fprintf(stderr, "https nfd: %d\n", nfd); |