arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-01 03:26:58 +03:00
Code Activity

ESP8266WebServer: send empty chunk when done sending chunked response

Browse Source 
Fixes https://github.com/esp8266/Arduino/issues/3225
This commit is contained in:
Ivan Grokhotkov
2017-12-14 11:10:01 +08:00
committed by Ivan Grokhotkov
parent 9b3583d227
commit 4c08389961
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
View File

@ -433,6 +433,9 @@ void ESP8266WebServer::sendContent(const String& content) {
_currentClient.write(content.c_str(), len);
if(_chunked){
_currentClient.write(footer, 2);
if (len == 0) {
_chunked = false;
}
}
}
@ -453,6 +456,9 @@ void ESP8266WebServer::sendContent_P(PGM_P content, size_t size) {
_currentClient.write_P(content, size);
if(_chunked){
_currentClient.write(footer, 2);
if (size == 0) {
_chunked = false;
}
}
}
@ -560,19 +566,27 @@ void ESP8266WebServer::_handleRequest() {
}
#endif
}
if (!handled) {
if(_notFoundHandler) {
_notFoundHandler();
}
else {
send(404, "text/plain", String("Not found: ") + _currentUri);
}
if (!handled && _notFoundHandler) {
_notFoundHandler();
handled = true;
}
if (!handled) {
send(404, "text/plain", String("Not found: ") + _currentUri);
handled = true;
}
if (handled) {
_finalizeResponse();
}
_currentUri = String();
}
void ESP8266WebServer::_finalizeResponse() {
if (_chunked) {
sendContent("");
}
}
String ESP8266WebServer::_responseCodeToString(int code) {
switch (code) {
case 100: return F("Continue");