From: Bernd Edlinger <bernd.edlinger@hotmail.de>
Date: Mon, 16 Apr 2018 12:16:26 +0000 (+0200)
Subject: Wait max. 60 seconds for s_client to connect
X-Git-Tag: OpenSSL_1_1_1-pre6~14
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bc6614484563f975a380bc97e907ce289036b802;p=oweals%2Fopenssl.git

Wait max. 60 seconds for s_client to connect

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5964)
---

diff --git a/util/perl/TLSProxy/Proxy.pm b/util/perl/TLSProxy/Proxy.pm
index de6d2fdf50..8df0153d24 100644
--- a/util/perl/TLSProxy/Proxy.pm
+++ b/util/perl/TLSProxy/Proxy.pm
@@ -349,7 +349,7 @@ sub clientstart
 
     # Wait for incoming connection from client
     my $fdset = IO::Select->new($self->{proxy_sock});
-    if (!$fdset->can_read(1)) {
+    if (!$fdset->can_read(60)) {
         kill(3, $self->{real_serverpid});
         die "s_client didn't try to connect\n";
     }