From fc8d96fb8b78571693cc66483c4654910cd1b917 Mon Sep 17 00:00:00 2001 From: david gauchard Date: Tue, 3 Dec 2019 23:17:52 +0100 Subject: [PATCH 1/2] webserver: fix sending char* --- libraries/ESP8266WebServer/src/ESP8266WebServer.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libraries/ESP8266WebServer/src/ESP8266WebServer.h b/libraries/ESP8266WebServer/src/ESP8266WebServer.h index 60b10249d1..c0a9625dd9 100644 --- a/libraries/ESP8266WebServer/src/ESP8266WebServer.h +++ b/libraries/ESP8266WebServer/src/ESP8266WebServer.h @@ -127,11 +127,8 @@ class ESP8266WebServerTemplate void send(int code, const char* content_type = NULL, const String& content = String("")); void send(int code, char* content_type, const String& content); void send(int code, const String& content_type, const String& content); - void send(int code, const char *content_type, const char *content, size_t content_length = 0) { - if (content_length == 0) { - content_length = strlen_P(content); - } - send_P(code, content_type, content, content_length); + void send(int code, const char *content_type, const char *content) { + send_P(code, content_type, content); } void send(int code, const char *content_type, const uint8_t *content, size_t content_length) { send_P(code, content_type, (const char *)content, content_length); From 881c82e066fe2e7a0ff9a0e31625dd6df0daf7b3 Mon Sep 17 00:00:00 2001 From: david gauchard Date: Tue, 3 Dec 2019 23:35:29 +0100 Subject: [PATCH 2/2] add missing char* overload --- libraries/ESP8266WebServer/src/ESP8266WebServer.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libraries/ESP8266WebServer/src/ESP8266WebServer.h b/libraries/ESP8266WebServer/src/ESP8266WebServer.h index c0a9625dd9..cde599c5e8 100644 --- a/libraries/ESP8266WebServer/src/ESP8266WebServer.h +++ b/libraries/ESP8266WebServer/src/ESP8266WebServer.h @@ -130,6 +130,9 @@ class ESP8266WebServerTemplate void send(int code, const char *content_type, const char *content) { send_P(code, content_type, content); } + void send(int code, const char *content_type, const char *content, size_t content_length) { + send_P(code, content_type, content, content_length); + } void send(int code, const char *content_type, const uint8_t *content, size_t content_length) { send_P(code, content_type, (const char *)content, content_length); }