handleFile send_P

dontsovcmc · Sep 17, 2023 · 2a7a19f · 2a7a19f
1 parent dac72a6
commit 2a7a19f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/WiFiManager.cpp b/WiFiManager.cpp
@@ -689,8 +689,7 @@ void WiFiManager::setupHTTPServer(){
   server->on(WM_G(R_erase),      std::bind(&WiFiManager::handleErase, this, false));
   server->on(WM_G(R_status),     std::bind(&WiFiManager::handleWiFiStatus, this));
 
-  server->on(WM_G(R_style_min_css),std::bind(&WiFiManager::handleFile, this, HTTP_TEXT_CSS, style_min_css));
-
+  server->on(WM_G(R_style_min_css),std::bind(&WiFiManager::handleFile, this, WM_G(HTTP_TEXT_CSS), style_min_css));
 
   server->onNotFound (std::bind(&WiFiManager::handleNotFound, this));
 
@@ -1447,15 +1446,14 @@ void WiFiManager::handleWifi(boolean scan) {
   #endif
 }
 
-void WiFiManager::handleFile(const char* progmem_file_type, 
-                             const char* progmem_string)
+void WiFiManager::handleFile(const char *progmem_file_type, 
+                             PGM_P progmem_string)
 {
   #ifdef WM_DEBUG_LEVEL
   DEBUG_WM(DEBUG_VERBOSE,F("<- HTTP File"));
   #endif
   handleRequest();
-  String content(FPSTR(progmem_string));
-  server->send(200, FPSTR(progmem_file_type), content);
+  server->send_P(200, progmem_file_type, progmem_string);
 }
 
 /**

diff --git a/WiFiManager.h b/WiFiManager.h
@@ -655,8 +655,8 @@ class WiFiManager
     void          handleNotFound();
     void          handleExit();
     void          handleClose();
-    void          handleFile(const char* progmem_file_type, 
-                             const char* progmem_string);
+    void          handleFile(const char * progmem_file_type, 
+                             PGM_P progmem_string);
 
     // void          handleErase();
     void          handleErase(boolean opt);