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 de6d2fdf50fbad1d7065784c1ba0bc734b7f9025..8df0153d2415b0a4c6bdc318c4ccb4de621883d7 100644 (file)
--- 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});
 
     # 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";
     }
         kill(3, $self->{real_serverpid});
         die "s_client didn't try to connect\n";
     }