From 56f368d273165b20c43a7975c7bad6256d5af064 Mon Sep 17 00:00:00 2001 From: Jennifer Lang Date: Wed, 4 Dec 2019 17:19:27 -0800 Subject: [PATCH] Fix sending headers in #send_P(int, PGM_P, PGM_P, size_t) The method #send(int, char*, char*[, size_t])) is a virtual method which calculates the size of the content then calls #send_P(int, PGM_P, PGM_P, size_t). This particular implementation of #send_P differs from the other implementations of #send and #send_P in that it uses #sendContent for headers and always calls #sendContent_P for contents even when the contents is not specified. The method #sendContent is intended for body and prepends the chunksize in chunk mode but this breaks the HTTP protocol which does not expect a chunksize prior to the headers. Fix is simply to do the same thing as all the other methods - call _currentClient.write and only call #sendContent_P if there is content to send. --- libraries/ESP8266WebServer/src/ESP8266WebServer-impl.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/ESP8266WebServer/src/ESP8266WebServer-impl.h b/libraries/ESP8266WebServer/src/ESP8266WebServer-impl.h index 9360f7deac..395267cd53 100644 --- a/libraries/ESP8266WebServer/src/ESP8266WebServer-impl.h +++ b/libraries/ESP8266WebServer/src/ESP8266WebServer-impl.h @@ -464,8 +464,10 @@ void ESP8266WebServerTemplate::send_P(int code, PGM_P content_type, char type[64]; memccpy_P((void*)type, (PGM_VOID_P)content_type, 0, sizeof(type)); _prepareHeader(header, code, (const char* )type, contentLength); - sendContent(header); - sendContent_P(content, contentLength); + _currentClient.write((const uint8_t *)header.c_str(), header.length()); + if (contentLength) { + sendContent_P(content, contentLength); + } } template