From 8ec93dcd26569f04875ba4086a4d3f3ff0a11816 Mon Sep 17 00:00:00 2001 From: david gauchard Date: Sun, 24 Nov 2019 00:12:37 +0100 Subject: [PATCH] use wificlient.available() where relevant (#6827) --- libraries/ArduinoOTA/ArduinoOTA.cpp | 2 +- libraries/ESP8266WebServer/src/ESP8266WebServer-impl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/ArduinoOTA/ArduinoOTA.cpp b/libraries/ArduinoOTA/ArduinoOTA.cpp index 0bc92989a..57fcd6fad 100644 --- a/libraries/ArduinoOTA/ArduinoOTA.cpp +++ b/libraries/ArduinoOTA/ArduinoOTA.cpp @@ -303,7 +303,7 @@ void ArduinoOTAClass::_runUpdate() { client.setNoDelay(true); uint32_t written, total = 0; - while (!Update.isFinished() && client.connected()) { + while (!Update.isFinished() && (client.connected() || client.available())) { int waited = 1000; while (!client.available() && waited--) delay(1); diff --git a/libraries/ESP8266WebServer/src/ESP8266WebServer-impl.h b/libraries/ESP8266WebServer/src/ESP8266WebServer-impl.h index 1efcf92e5..9360f7dea 100644 --- a/libraries/ESP8266WebServer/src/ESP8266WebServer-impl.h +++ b/libraries/ESP8266WebServer/src/ESP8266WebServer-impl.h @@ -319,7 +319,7 @@ void ESP8266WebServerTemplate::handleClient() { bool keepCurrentClient = false; bool callYield = false; - if (_currentClient.connected()) { + if (_currentClient.connected() || _currentClient.available()) { switch (_currentStatus) { case HC_NONE: // No-op to avoid C++ compiler warning