The branch master has been updated
via 4130016623d043c7279f39937a73c24200288a73 (commit)
from 6e5a853bda24e8aece325ecf5aa68b8ea832e414 (commit)
- Log -----------------------------------------------------------------
commit 4130016623d043c7279f39937a73c24200288a73
Author: Matt Caswell <[email protected]>
Date: Thu Aug 31 09:39:26 2017 +0100
Fix Proxy where a timeout occurs waiting for both client and server
Reviewed-by: Rich Salz <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/4305)
-----------------------------------------------------------------------
Summary of changes:
util/perl/TLSProxy/Proxy.pm | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/util/perl/TLSProxy/Proxy.pm b/util/perl/TLSProxy/Proxy.pm
index c92652e..f3e76bf 100644
--- a/util/perl/TLSProxy/Proxy.pm
+++ b/util/perl/TLSProxy/Proxy.pm
@@ -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";
}
}
}
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
