[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  82992a4130e668c14ff66fca26170629b23c4556 (commit)
      from  7d461736f7bd3af3c2f266f8541034ecf6f41ed9 (commit)


- Log -----------------------------------------------------------------
commit 82992a4130e668c14ff66fca26170629b23c4556
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Jan 16 15:04:51 2018 +0000

    Extend timeout for TLSProxy
    
    I received this error from a TLSProxy test:
    
    Failed to start up server (localhost,4443): Transport endpoint is not
    connected
    
    So, extend the timeout before we give up trying to connect to the server.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5088)

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

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 cc21bd6..d778d0e 100644
--- a/util/perl/TLSProxy/Proxy.pm
+++ b/util/perl/TLSProxy/Proxy.pm
@@ -255,7 +255,7 @@ sub clientstart
     print "Connection opened\n";
 
     # Now connect to the server
-    my $retry = 10;
+    my $retry = 50;
     my $server_sock;
     #We loop over this a few times because sometimes s_server can take a while
     #to start up