Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wrong timeout in WebQuery and webclient since Core3 #21442

Merged
merged 1 commit into from
May 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ All notable changes to this project will be documented in this file.
- Watchdog restart or freeze if ``displaytext`` is more than 128 characters (#21401)
- Avoid connection errors when switching to safeboot to upload OTA firmware (#21428)
- Berry Leds matrix alternate more and error about 'bri' attribute (#21431)
- Wrong timeout in `WebQuery` and `webclient` since Core3

### Removed
- Support of old insecure fingerprint algorithm. Deprecated since v8.4.0 (#21417)
Expand Down
2 changes: 1 addition & 1 deletion lib/libesp32/ESP-Mail-Client/src/ESP_Mail_TCPClient.h
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ class ESP_Mail_TCPClient
*/
void setTimeout(uint32_t timeoutSec)
{
_tcp_client->setTimeout(timeoutSec);
_tcp_client->setTimeout(timeoutSec * 1000);
}

/** Set the BearSSL IO buffer size.
Expand Down
4 changes: 2 additions & 2 deletions lib/libesp32/HttpClientLight/src/HttpClientLight.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ void HTTPClientLight::setTimeout(uint16_t timeout)
{
_tcpTimeout = timeout;
if(connected()) {
_client->setTimeout((timeout + 500) / 1000);
_client->setTimeout(timeout);
}
}

Expand Down Expand Up @@ -1176,7 +1176,7 @@ bool HTTPClientLight::connect(void)
}

// set Timeout for WiFiClient and for Stream::readBytesUntil() and Stream::readStringUntil()
_client->setTimeout((_tcpTimeout + 500) / 1000);
_client->setTimeout(_tcpTimeout);

log_d(" connected to %s:%u", _host.c_str(), _port);

Expand Down