Merge branch 'master' into master

Author: bkari02

Diff for: libraries/WiFi/src/WiFiClient.cpp

@@ -348,6 +348,11 @@ int WiFiClient::getOption(int option, int *value)
     return res;
 }
 
+void WiFiClient::setConnectionTimeout(uint32_t milliseconds)
+{
+    _timeout = milliseconds;
+}
+
 int WiFiClient::setNoDelay(bool nodelay)
 {
     int flag = nodelay;

Diff for: libraries/WiFi/src/WiFiClient.h

@@ -33,6 +33,7 @@ class ESPLwIPClient : public Client
 public:
         virtual int connect(IPAddress ip, uint16_t port, int32_t timeout) = 0;
         virtual int connect(const char *host, uint16_t port, int32_t timeout) = 0;
+        virtual void setConnectionTimeout(uint32_t milliseconds) = 0;
 };
 
 class WiFiClient : public ESPLwIPClient
@@ -92,6 +93,7 @@ class WiFiClient : public ESPLwIPClient
     int getSocketOption(int level, int option, const void* value, size_t size);
     int setOption(int option, int *value);
     int getOption(int option, int *value);
+    void setConnectionTimeout(uint32_t milliseconds);
     int setNoDelay(bool nodelay);
     bool getNoDelay();