temporarly fix for handling PGM_P content_type properly in ESP8266WebServer::send_P() functions

martinayotte · martinayotte · commit 26537beb105e · 2015-09-09T12:03:07.000-04:00
diff --git a/hardware/esp8266com/esp8266/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp b/hardware/esp8266com/esp8266/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
@@ -164,14 +164,18 @@ void ESP8266WebServer::send_P(int code, PGM_P content_type, PGM_P content) {
     }
 
     String header;
-    _prepareHeader(header, code, String(FPSTR(content_type)).c_str(), contentLength);
+    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);
 }
 
 void ESP8266WebServer::send_P(int code, PGM_P content_type, PGM_P content, size_t contentLength) {
     String header;
-    _prepareHeader(header, code, String(FPSTR(content_type)).c_str(), contentLength);
+    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);
 }

Original file line number	Diff line number	Diff line change
`@@ -164,14 +164,18 @@ void ESP8266WebServer::send_P(int code, PGM_P content_type, PGM_P content) {`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`String header;`
`167`		`- _prepareHeader(header, code, String(FPSTR(content_type)).c_str(), contentLength);`
	`167`	`+ char type[64];`
	`168`	`+ memccpy_P((void*)type, (PGM_VOID_P)content_type, 0, sizeof(type));`
	`169`	`+ _prepareHeader(header, code, (const char* )type, contentLength);`
`168`	`170`	`sendContent(header);`
`169`	`171`	`sendContent_P(content);`
`170`	`172`	`}`
`171`	`173`
`172`	`174`	`void ESP8266WebServer::send_P(int code, PGM_P content_type, PGM_P content, size_t contentLength) {`
`173`	`175`	`String header;`
`174`		`- _prepareHeader(header, code, String(FPSTR(content_type)).c_str(), contentLength);`
	`176`	`+ char type[64];`
	`177`	`+ memccpy_P((void*)type, (PGM_VOID_P)content_type, 0, sizeof(type));`
	`178`	`+ _prepareHeader(header, code, (const char* )type, contentLength);`
`175`	`179`	`sendContent(header);`
`176`	`180`	`sendContent_P(content, contentLength);`
`177`	`181`	`}`