[openssl-commits] [openssl] master update

[bernd.edlinger at hotmail.de]

The branch master has been updated
       via  bc6614484563f975a380bc97e907ce289036b802 (commit)
      from  f06080cb3da93e99755edb5f19e7ccc132aeba36 (commit)


- Log -----------------------------------------------------------------
commit bc6614484563f975a380bc97e907ce289036b802
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Mon Apr 16 14:16:26 2018 +0200

    Wait max. 60 seconds for s_client to connect
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5964)

-----------------------------------------------------------------------

Summary of changes:
 util/perl/TLSProxy/Proxy.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/perl/TLSProxy/Proxy.pm b/util/perl/TLSProxy/Proxy.pm
index de6d2fd..8df0153 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";
     }