Commit a874ddee authored by runge's avatar runge

x11vnc: make https fetch in accept_openssl() work again.

parent 057fdbb3
x11vnc README file Date: Fri Feb 16 13:40:55 EST 2007 x11vnc README file Date: Fri Feb 16 20:41:26 EST 2007
The following information is taken from these URLs: The following information is taken from these URLs:
...@@ -10903,7 +10903,7 @@ Options: ...@@ -10903,7 +10903,7 @@ Options:
via the login and password prompt. via the login and password prompt.
Also in the case of -unixpw, the user logging in can Also in the case of -unixpw, the user logging in can
place a colon at the end of his username and supply place a colon at the end of her username and supply
a few options: scale=, scale_cursor= (or sc=), solid a few options: scale=, scale_cursor= (or sc=), solid
(or so), id=, clear_mods (or cm), clear_keys (or ck), (or so), id=, clear_mods (or cm), clear_keys (or ck),
repeat, speeds= (or sp=), readtimeout= (or rd=), repeat, speeds= (or sp=), readtimeout= (or rd=),
......
...@@ -786,7 +786,7 @@ void print_help(int mode) { ...@@ -786,7 +786,7 @@ void print_help(int mode) {
" via the login and password prompt.\n" " via the login and password prompt.\n"
"\n" "\n"
" Also in the case of -unixpw, the user logging in can\n" " Also in the case of -unixpw, the user logging in can\n"
" place a colon at the end of his username and supply\n" " place a colon at the end of her username and supply\n"
" a few options: scale=, scale_cursor= (or sc=), solid\n" " a few options: scale=, scale_cursor= (or sc=), solid\n"
" (or so), id=, clear_mods (or cm), clear_keys (or ck),\n" " (or so), id=, clear_mods (or cm), clear_keys (or ck),\n"
" repeat, speeds= (or sp=), readtimeout= (or rd=),\n" " repeat, speeds= (or sp=), readtimeout= (or rd=),\n"
......
...@@ -1453,29 +1453,8 @@ void accept_openssl(int mode) { ...@@ -1453,29 +1453,8 @@ void accept_openssl(int mode) {
if (i == 2) { if (i == 2) {
continue; continue;
} }
if (i == listen) {
continue;
}
close(i); close(i);
} }
if (screen->listenSock >= 0) {
close(screen->listenSock);
FD_CLR(screen->listenSock,&screen->allFds);
screen->listenSock = -1;
}
if (screen->httpListenSock >= 0) {
close(screen->httpListenSock);
FD_CLR(screen->httpListenSock,&screen->allFds);
screen->httpListenSock = -1;
}
if (openssl_sock >= 0) {
close(openssl_sock);
openssl_sock = -1;
}
if (https_sock >= 0) {
close(https_sock);
https_sock = -1;
}
/* /*
* sadly, we are a long lived child and so the large * sadly, we are a long lived child and so the large
......
...@@ -933,7 +933,7 @@ above command is run as the user who just authenticated ...@@ -933,7 +933,7 @@ above command is run as the user who just authenticated
via the login and password prompt. via the login and password prompt.
.IP .IP
Also in the case of \fB-unixpw,\fR the user logging in can Also in the case of \fB-unixpw,\fR the user logging in can
place a colon at the end of his username and supply place a colon at the end of her username and supply
a few options: scale=, scale_cursor= (or sc=), solid a few options: scale=, scale_cursor= (or sc=), solid
(or so), id=, clear_mods (or cm), clear_keys (or ck), (or so), id=, clear_mods (or cm), clear_keys (or ck),
repeat, speeds= (or sp=), readtimeout= (or rd=), repeat, speeds= (or sp=), readtimeout= (or rd=),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment