mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-21 01:15:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix Proxy where a timeout occurs waiting for both client and server

Browse Source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4305)
This commit is contained in:
Matt Caswell 2017-08-31 09:39:26 +01:00
parent 6e5a853bda
commit 4130016623
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
util/perl/TLSProxy/Proxy.pm
View File

@ -297,8 +297,11 @@ sub clientstart
while( (!(TLSProxy::Message->end)
|| (defined $self->sessionfile()
&& (-s $self->sessionfile()) == 0))
&& $ctr < 10
&& (@ready = $sel->can_read(1))) {
&& $ctr < 10) {
if (!(@ready = $sel->can_read(1))) {
$ctr++;
next;
}
foreach my $hand (@ready) {
if ($hand == $server_sock) {
$server_sock->sysread($indata, 16384) or goto END;
@ -311,7 +314,7 @@ sub clientstart
$server_sock->syswrite($indata);
$ctr = 0;
} else {
$ctr++
die "Unexpected handle";
}
}
}