[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  142463c9375efdcdaa4c504f6aaf5bfd61d5ba99 (commit)
      from  04dec1ab34df70c1588d42cc394e8fa8b5f3191c (commit)


- Log -----------------------------------------------------------------
commit 142463c9375efdcdaa4c504f6aaf5bfd61d5ba99
Author: Matt Caswell <matt at openssl.org>
Date:   Wed May 31 10:27:32 2017 +0100

    Wait longer for the server in TLSProxy to start
    
    In a recent PR (#3566) it seems that TLSProxy gave up trying to connect to
    the server process too quickly. This meant the test failed even though the
    server *did* eventually start. Currently we try 3 times to connect with a
    0.1 second pause between each attempt. That is probably too aggressive.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3587)

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

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

diff --git a/util/TLSProxy/Proxy.pm b/util/TLSProxy/Proxy.pm
index 5c363e7..c92652e 100644
--- a/util/TLSProxy/Proxy.pm
+++ b/util/TLSProxy/Proxy.pm
@@ -255,7 +255,7 @@ sub clientstart
     print "Connection opened\n";
 
     # Now connect to the server
-    my $retry = 3;
+    my $retry = 10;
     my $server_sock;
     #We loop over this a few times because sometimes s_server can take a while
     #to start up