From 95b1348a71e6cb1a5e125e0ed479809c872d196e Mon Sep 17 00:00:00 2001
From: Ivan Grokhotkov <igrr@users.noreply.github.com>
Date: Fri, 23 Mar 2018 23:19:45 +0800
Subject: [PATCH] WiFiClient: clean up ClientContext before connecting (#4516)

Fixes https://github.com/esp8266/Arduino/issues/4497
---
 libraries/ESP8266WiFi/src/WiFiClient.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libraries/ESP8266WiFi/src/WiFiClient.cpp b/libraries/ESP8266WiFi/src/WiFiClient.cpp
index cf2703ef9..fb3f2025f 100644
--- a/libraries/ESP8266WiFi/src/WiFiClient.cpp
+++ b/libraries/ESP8266WiFi/src/WiFiClient.cpp
@@ -112,8 +112,11 @@ int WiFiClient::connect(IPAddress ip, uint16_t port)
     ip_addr_t addr;
     addr.addr = ip;
 
-    if (_client)
+    if (_client) {
         stop();
+        _client->unref();
+        _client = nullptr;
+    }
 
     // if the default interface is down, tcp_connect exits early without
     // ever calling tcp_err