Skip to content

forgot to add the timeout check to safe_write_P #835

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.

Sign up for GitHub

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

Merged
IgorYbema merged 1 commit into from
Mar 26, 2026
Merged

forgot to add the timeout check to safe_write_P #835

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions HeishaMon/src/common/webserver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ static int16_t safe_write(struct webserver_t *client, const uint8_t *buf, uint16
#if defined(ESP8266)
uint32_t start = millis();
while(client->client->availableForWrite() == 0) {
if((unsigned long)(millis() - start) > 5000) {
if((unsigned long)(millis() - start) > 1000) {
// client is too slow, give up
client->step = WEBSERVER_CLIENT_CLOSE;
return -1;
Expand All @@ -97,10 +97,16 @@ static int16_t safe_write(struct webserver_t *client, const uint8_t *buf, uint16

static int16_t safe_write_P(struct webserver_t *client, PGM_P buf, uint16_t len) {
#if defined(ESP8266)
if(client->client->availableForWrite() == 0) {
return 0;
uint32_t start = millis();
while(client->client->availableForWrite() == 0) {
if((unsigned long)(millis() - start) > 1000) {
// client is too slow, give up
client->step = WEBSERVER_CLIENT_CLOSE;
return -1;
}
yield();
}
#endif
#endif
return client->client->write_P((char *)buf, len);
}

Expand Down
Loading