andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-07-29 01:52:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

set 10 sectimeout for http requests

Browse Source
This commit is contained in:
MichaelDvP
2026-07-12 17:17:07 +02:00
parent cb1cb356ce
commit 2b25ae18d1
4 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG_LATEST.md
View File

@@ -27,3 +27,4 @@ For more details go to [emsesp.org](https://emsesp.org/).
- Dewtemperature for Easycontrol calculated by ems-esp [#3135](https://github.com/emsesp/EMS-ESP32/issues/3135) - Dewtemperature for Easycontrol calculated by ems-esp [#3135](https://github.com/emsesp/EMS-ESP32/issues/3135)
- add option for sync thermostat to ntp, allow different time zones [#3148](https://github.com/emsesp/EMS-ESP32/discussions/3148), **defaults to sync**. - add option for sync thermostat to ntp, allow different time zones [#3148](https://github.com/emsesp/EMS-ESP32/discussions/3148), **defaults to sync**.
- block too many GET requests [mentioned in #3104](https://github.com/emsesp/EMS-ESP32/issues/3104) - block too many GET requests [mentioned in #3104](https://github.com/emsesp/EMS-ESP32/issues/3104)
- set 10 sec timeout for http requests [#3104](https://github.com/emsesp/EMS-ESP32/issues/3104)

2
src/core/shuntingYard.cpp
View File

@@ -728,6 +728,8 @@ std::string compute(const std::string & expr) {
} }
if (url.substr(0, 4) == "http") { // match http and https if (url.substr(0, 4) == "http") { // match http and https
HTTPClient * http = new HTTPClient; HTTPClient * http = new HTTPClient;
http->setConnectTimeout(10000);
http->setTimeout(10000);
if (http->begin(url.c_str())) { if (http->begin(url.c_str())) {
int httpResult = 0; int httpResult = 0;
for (JsonPair p : doc[header_s].as<JsonObject>()) { for (JsonPair p : doc[header_s].as<JsonObject>()) {

2
src/emsesp_version.h
View File

@@ -1 +1 @@
#define EMSESP_APP_VERSION "3.8.3-dev.8d" #define EMSESP_APP_VERSION "3.8.3-dev.8e"

4
src/web/WebSchedulerService.cpp
View File

@@ -355,7 +355,9 @@ bool WebSchedulerService::command(const char * name, const std::string & command
JsonDocument doc; JsonDocument doc;
if (deserializeJson(doc, cmd) == DeserializationError::Ok) { if (deserializeJson(doc, cmd) == DeserializationError::Ok) {
HTTPClient * http = new HTTPClient; HTTPClient * http = new HTTPClient;
std::string url = doc["url"] | ""; http->setConnectTimeout(10000);
http->setTimeout(10000);
std::string url = doc["url"] | "";
// for a GET with parameters replace commands with values // for a GET with parameters replace commands with values
// don't search the complete url, it may contain a devicename in path // don't search the complete url, it may contain a devicename in path
auto q = url.find_first_of('?'); auto q = url.find_first_of('?');