ESP8266HTTPClient: allow changing connection timeout using setTimeout (#4038)

igrr · devyte · commit 237f7d9b18ef · 2017-12-27T23:53:31.000-03:00
Call Client::setTimeout before connection to influence connection timeout. Closes #3451.
diff --git a/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp b/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp
@@ -840,6 +840,7 @@ bool HTTPClient::connect(void)
     }
 
     _tcp = _transportTraits->create();
+    _tcp->setTimeout(_tcpTimeout);
 
     if(!_tcp->connect(_host.c_str(), _port)) {
         DEBUG_HTTPCLIENT("[HTTP-Client] failed connect to %s:%u\n", _host.c_str(), _port);
@@ -854,8 +855,6 @@ bool HTTPClient::connect(void)
         return false;
     }
 
-    // set Timeout for readBytesUntil and readStringUntil
-    _tcp->setTimeout(_tcpTimeout);
 
 #ifdef ESP8266
     _tcp->setNoDelay(true);

Original file line number	Diff line number	Diff line change
`@@ -840,6 +840,7 @@ bool HTTPClient::connect(void)`
`840`	`840`	`}`
`841`	`841`
`842`	`842`	`_tcp = _transportTraits->create();`
	`843`	`+ _tcp->setTimeout(_tcpTimeout);`
`843`	`844`
`844`	`845`	`if(!_tcp->connect(_host.c_str(), _port)) {`
`845`	`846`	`DEBUG_HTTPCLIENT("[HTTP-Client] failed connect to %s:%u\n", _host.c_str(), _port);`
`@@ -854,8 +855,6 @@ bool HTTPClient::connect(void)`
`854`	`855`	`return false;`
`855`	`856`	`}`
`856`	`857`
`857`		`- // set Timeout for readBytesUntil and readStringUntil`
`858`		`- _tcp->setTimeout(_tcpTimeout);`
`859`	`858`
`860`	`859`	`#ifdef ESP8266`
`861`	`860`	`_tcp->setNoDelay(true);`