From: Viktor Dukhovni <openssl-users@dukhovni.org>
Date: Sat, 20 Feb 2016 23:17:28 +0000 (-0500)
Subject: Work-around for proxy->s_server retry logic
X-Git-Tag: OpenSSL_1_1_0-pre4~572
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dca97e9bfdfbb62b9a4f664ee901a826bc338ad7;p=oweals%2Fopenssl.git

Work-around for proxy->s_server retry logic

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/util/TLSProxy/Proxy.pm b/util/TLSProxy/Proxy.pm
index 7d21f4e83d..96e368189e 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);