arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00
Code

Fix reuse for different URIs in HTTPClient::begin (#8466)

Browse Source
This commit is contained in:
Paulo Cabral Sanz 2022-03-30 05:35:46 -03:00 committed by GitHub
parent 06e3c562ef
commit 32939c4334
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp
View File

@ -102,9 +102,16 @@ bool HTTPClient::begin(WiFiClient &client, const String& url) {
*/ */
bool HTTPClient::begin(WiFiClient &client, const String& host, uint16_t port, const String& uri, bool https) bool HTTPClient::begin(WiFiClient &client, const String& host, uint16_t port, const String& uri, bool https)
{ {
// Disconnect when reusing HTTPClient to talk to a different host
if (!_host.isEmpty() && _host != host) {
_canReuse = false;
disconnect(true);
}
_client = client.clone(); _client = client.clone();
clear(); clear();
_host = host; _host = host;
_port = port; _port = port;
_uri = uri; _uri = uri;
@ -155,6 +162,8 @@ bool HTTPClient::beginInternal(const String& __url, const char* expectedProtocol
_base64Authorization = base64::encode(auth, false /* doNewLines */); _base64Authorization = base64::encode(auth, false /* doNewLines */);
} }
const String oldHost = _host;
// get port // get port
index = host.indexOf(':'); index = host.indexOf(':');
if(index >= 0) { if(index >= 0) {
@ -164,6 +173,13 @@ bool HTTPClient::beginInternal(const String& __url, const char* expectedProtocol
} else { } else {
_host = host; _host = host;
} }
// Disconnect when reusing HTTPClient to talk to a different host
if (!oldHost.isEmpty() && _host != oldHost) {
_canReuse = false;
disconnect(true);
}
_uri = url; _uri = url;
if ( expectedProtocol != nullptr && _protocol != expectedProtocol) { if ( expectedProtocol != nullptr && _protocol != expectedProtocol) {