[openssl-commits] [openssl] master update

[Viktor Dukhovni]

The branch master has been updated
       via  dca97e9bfdfbb62b9a4f664ee901a826bc338ad7 (commit)
      from  834aae2a99eeab7be8da4b8370188bc56f862e96 (commit)


- Log -----------------------------------------------------------------
commit dca97e9bfdfbb62b9a4f664ee901a826bc338ad7
Author: Viktor Dukhovni <openssl-users at dukhovni.org>
Date:   Sat Feb 20 18:17:28 2016 -0500

    Work-around for proxy->s_server retry logic
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

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

diff --git a/util/TLSProxy/Proxy.pm b/util/TLSProxy/Proxy.pm
index 7d21f4e..96e3681 100644
--- a/util/TLSProxy/Proxy.pm
+++ b/util/TLSProxy/Proxy.pm
@@ -269,7 +269,9 @@ sub clientstart
         );
 
         $retry--;
-        if (!$server_sock) {
+        if ($@ || !defined($server_sock)) {
+            $server_sock->close() if defined($server_sock);
+            undef $server_sock;
             if ($retry) {
                 #Sleep for a short while
                 select(undef, undef, undef, 0.1);