v1.5.1 to fix String-related bug

### Releases v1.5.1

1. Fix bug related to String in library and examples

Author: khoih-prog

CONTRIBUTING.md

@@ -14,7 +14,7 @@ If you don't find anything, please [open a new issue](https://github.com/khoih-p
 
 Please ensure to specify the following:
 
-* Arduino IDE version (e.g. 1.8.18) or Platform.io version
+* Arduino IDE version (e.g. 1.8.19) or Platform.io version
 * Board Core Version (e.g. Arduino SAMDUE core v1.6.12, ESP8266 core v3.0.2, ArduinoCore-mbed v2.6.1, etc.)
 * Contextual information (e.g. what you were trying to achieve)
 * Simplest possible steps to reproduce
@@ -26,7 +26,7 @@ Please ensure to specify the following:
 ### Example
 
 ```
-Arduino IDE version: 1.8.18
+Arduino IDE version: 1.8.19
 RASPBERRY_PI_PICO board
 ArduinoCore-mbed v2.6.1
 OS: Ubuntu 20.04 LTS

README.md

@@ -12,6 +12,7 @@
 ## Table of Contents
 
 * [Changelog](#changelog)
+  * [Releases v1.5.1](#releases-v151)
   * [Major Releases v1.5.0](#major-releases-v150)
   * [Releases v1.4.2](#releases-v142)
   * [Releases v1.4.1](#releases-v141)
@@ -35,6 +36,10 @@
 
 ## Changelog
 
+### Releases v1.5.1
+
+1. Fix bug related to String in library and examples
+
 ### Major Releases v1.5.0
 
 1. Reduce usage of Arduino String with std::string

changelog.md

@@ -1,6 +1,6 @@
 {
   "name": "WiFiWebServer",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "keywords": "wifi, wi-fi, WebServer, WiFiNINA, WiFi101, ESP32, Portenta-H7, Teensy, SAM DUE, SAMD, STM32, nRF52, rpi-pico, rp2040, HTTP-Client, WebSocket-Client, server, client, websocket, AVR, Mega",
   "description": "Simple WiFiWebServer, HTTP Client and WebSocket Client library for AVR Mega, Portenta_H7, Teensy, SAM DUE, SAMD21, SAMD51, STM32F/L/H/G/WB/MP1, nRF52, RP2040-based (Nano-RP2040-Connect, RASPBERRY_PI_PICO, ESP32/ESP8266, etc.) boards using WiFi, such as WiFiNINA, WiFi101, U-Blox W101, W102, ESP8266/ESP32-AT modules/shields, with functions similar to those of ESP8266/ESP32 WebServer libraries.",
   "authors":

library.json

@@ -1,5 +1,5 @@
 name=WiFiWebServer
-version=1.5.0
+version=1.5.1
 author=Khoi Hoang
 license=MIT
 maintainer=Khoi Hoang <khoih.prog@gmail.com>

library.properties

@@ -12,7 +12,7 @@
   @file       Esp8266WebServer.h
   @author     Ivan Grokhotkov
 
-  Version: 1.5.0
+  Version: 1.5.1
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -34,6 +34,7 @@
   1.4.1   K Hoang      04/10/2021 Change option for PIO `lib_compat_mode` from default `soft` to `strict`. Update Packages Patches
   1.4.2   K Hoang      12/10/2021 Update `platform.ini` and `library.json`
   1.5.0   K Hoang      19/12/2021 Reduce usage of Arduino String with std::string
+  1.5.1   K Hoang      25/12/2021 Fix bug
  ***************************************************************************************************************************************/
 
 #pragma once

src/Parsing-impl.h

@@ -12,7 +12,7 @@
   @file       Esp8266WebServer.h
   @author     Ivan Grokhotkov
 
-  Version: 1.5.0
+  Version: 1.5.1
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -34,6 +34,7 @@
   1.4.1   K Hoang      04/10/2021 Change option for PIO `lib_compat_mode` from default `soft` to `strict`. Update Packages Patches
   1.4.2   K Hoang      12/10/2021 Update `platform.ini` and `library.json`
   1.5.0   K Hoang      19/12/2021 Reduce usage of Arduino String with std::string
+  1.5.1   K Hoang      25/12/2021 Fix bug
  *****************************************************************************************************************************/
 
 // Library to simplify HTTP fetching on Arduino

src/WiFiHttpClient.h

@@ -12,7 +12,7 @@
   @file       Esp8266WebServer.h
   @author     Ivan Grokhotkov
 
-  Version: 1.5.0
+  Version: 1.5.1
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -34,6 +34,7 @@
   1.4.1   K Hoang      04/10/2021 Change option for PIO `lib_compat_mode` from default `soft` to `strict`. Update Packages Patches
   1.4.2   K Hoang      12/10/2021 Update `platform.ini` and `library.json`
   1.5.0   K Hoang      19/12/2021 Reduce usage of Arduino String with std::string
+  1.5.1   K Hoang      25/12/2021 Fix bug
  ***************************************************************************************************************************************/
 
 #pragma once
@@ -398,23 +399,18 @@ void WiFiWebServer::stop()
 
 void WiFiWebServer::sendHeader(const String& name, const String& value, bool first) 
 {
-  //String headerLine = name;
   WWString headerLine = fromString(name);
 
   headerLine += ": ";
-  //headerLine += value;
   headerLine += fromString(value);
-  //headerLine += RETURN_NEWLINE;
   headerLine += RETURN_NEWLINE;
 
   if (first) 
   {
-    //_responseHeaders = headerLine + _responseHeaders;
     _responseHeaders = fromWWString(headerLine + fromString(_responseHeaders));
   }
   else 
   {
-    //_responseHeaders += headerLine;
     _responseHeaders = fromWWString(fromString(_responseHeaders) + headerLine);
   }
 }
@@ -427,7 +423,6 @@ void WiFiWebServer::setContentLength(size_t contentLength)
 
 void WiFiWebServer::_prepareHeader(String& response, int code, const char* content_type, size_t contentLength) 
 {
-#if 1
   WWString aResponse = fromString(response);
 
   aResponse = "HTTP/1." + fromString(String(_currentVersion)) + " ";
@@ -469,50 +464,7 @@ void WiFiWebServer::_prepareHeader(String& response, int code, const char* conte
 
   response = fromWWString(aResponse);
 
-  //MR & KH fix
-  _responseHeaders = *(new String());
-#else
-  response = "HTTP/1." + String(_currentVersion) + " ";
-  response += String(code);
-  response += " ";
-  response += _responseCodeToString(code);
-  response += RETURN_NEWLINE;
-
-  using namespace mime;
-  
-  if (!content_type)
-      content_type = mimeTable[html].mimeType;
-
-  sendHeader("Content-Type", content_type, true);
-  
-  if (_contentLength == CONTENT_LENGTH_NOT_SET) 
-  {
-    sendHeader("Content-Length", String(contentLength));
-  } 
-  else if (_contentLength != CONTENT_LENGTH_UNKNOWN) 
-  {
-    sendHeader("Content-Length", String(_contentLength));
-  } 
-  else if (_contentLength == CONTENT_LENGTH_UNKNOWN && _currentVersion) 
-  { 
-    //HTTP/1.1 or above client
-    //let's do chunked
-    _chunked = true;
-    sendHeader("Accept-Ranges", "none");
-    sendHeader("Transfer-Encoding", "chunked");
-  }
-
-  WS_LOGDEBUG(F("_prepareHeader sendHeader Conn close"));
-
-  sendHeader("Connection", "close");
-
-  response += _responseHeaders;
-  response += RETURN_NEWLINE;
-  
-  // RM & KH fix
-  //_responseHeaders = String();
-  _responseHeaders = *(new String());
-#endif  
+  _responseHeaders = String("");
 }
 
 void WiFiWebServer::_prepareHeader(WWString& response, int code, const char* content_type, size_t contentLength) 
@@ -554,13 +506,11 @@ void WiFiWebServer::_prepareHeader(WWString& response, int code, const char* con
   response += fromString(_responseHeaders);
   response += RETURN_NEWLINE;
 
-  //MR & KH fix
-  _responseHeaders = *(new String()); 
+  _responseHeaders = String("");
 }
 
 void WiFiWebServer::send(int code, const char* content_type, const String& content) 
 {
-  //String header;
   WWString header;
 
   // Can we asume the following?
@@ -577,14 +527,12 @@ void WiFiWebServer::send(int code, const char* content_type, const String& conte
   if (content.length())
   {
     WS_LOGDEBUG1(F("send1: write header = "), fromWWString(header));
-    //sendContent(content);
     sendContent(content, content.length());
   }
 }
 
 void WiFiWebServer::send(int code, char* content_type, const String& content, size_t contentLength)
 {
-  //String header;
   WWString header;
 
   WS_LOGDEBUG1(F("send2: len = "), contentLength);
@@ -698,7 +646,6 @@ void WiFiWebServer::send_P(int code, PGM_P content_type, PGM_P content)
 
 void WiFiWebServer::send_P(int code, PGM_P content_type, PGM_P content, size_t contentLength) 
 {
-  //String header;
   WWString header;
 
   char type[64];
@@ -773,7 +720,9 @@ void WiFiWebServer::sendContent_P(PGM_P content, size_t size)
 }
 
 #if (ESP32 || ESP8266)
+
 #include "FS.h"
+
 void WiFiWebServer::serveStatic(const char* uri, FS& fs, const char* path, const char* cache_header) 
 {
   _addRequestHandler(new StaticFileRequestHandler(fs, path, uri, cache_header));
@@ -795,6 +744,7 @@ void WiFiWebServer::_streamFileCore(const size_t fileSize, const String &fileNam
   send(200, contentType, emptyString);
 }
 #endif
+
 //////
 
 String WiFiWebServer::arg(const String& name) 
@@ -969,9 +919,7 @@ void WiFiWebServer::_handleRequest()
   //_currentUri = String();
   WS_LOGDEBUG(F("_handleRequest: Done Clear _currentUri"));
 #else
-  // RM & KH fix
-  //_currentUri = String();
-  _currentUri = *(new String());
+  _responseHeaders = String("");
 #endif  
 }
 

src/WiFiWebServer-impl.h

@@ -12,7 +12,7 @@
   @file       Esp8266WebServer.h
   @author     Ivan Grokhotkov
 
-  Version: 1.5.0
+  Version: 1.5.1
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -34,17 +34,18 @@
   1.4.1   K Hoang      04/10/2021 Change option for PIO `lib_compat_mode` from default `soft` to `strict`. Update Packages Patches
   1.4.2   K Hoang      12/10/2021 Update `platform.ini` and `library.json`
   1.5.0   K Hoang      19/12/2021 Reduce usage of Arduino String with std::string
+  1.5.1   K Hoang      25/12/2021 Fix bug
  ***************************************************************************************************************************************/
 
 #pragma once
 
-#define WIFI_WEBSERVER_VERSION          "WiFiWebServer v1.5.0"
+#define WIFI_WEBSERVER_VERSION          "WiFiWebServer v1.5.1"
 
 #define WIFI_WEBSERVER_VERSION_MAJOR    1
 #define WIFI_WEBSERVER_VERSION_MINOR    5
-#define WIFI_WEBSERVER_VERSION_PATCH    0
+#define WIFI_WEBSERVER_VERSION_PATCH    1
 
-#define WIFI_WEBSERVER_VERSION_INT      1005000
+#define WIFI_WEBSERVER_VERSION_INT      1005001
 
 #define USE_NEW_WEBSERVER_VERSION       true
 
@@ -314,17 +315,17 @@ class WiFiWebServer
     }
 
     //KH
-    #if USE_NEW_WEBSERVER_VERSION
+#if USE_NEW_WEBSERVER_VERSION
     HTTPUpload& upload() 
     {
       return *_currentUpload;
     }
-    #else
+#else
     HTTPUpload& upload() 
     {
       return _currentUpload;
     }
-    #endif
+#endif
 
     String arg(const String& name);     // get request argument value by name
     String arg(int i);                  // get request argument value by number
@@ -366,8 +367,7 @@ class WiFiWebServer
 
     static String urlDecode(const String& text);
 
-#if 0    
-
+#if !(ESP32 || ESP8266)
     template<typename T> size_t streamFile(T &file, const String& contentType) 
     {
       using namespace mime;
@@ -382,25 +382,9 @@ class WiFiWebServer
 
       return _currentClient.write(file);
     }
-#endif
-
-
-    #if !(ESP32 || ESP8266)
-    template<typename T> size_t streamFile(T &file, const String& contentType) 
-    {
-      using namespace mime;
-      setContentLength(file.size());
-      
-      if (String(file.name()).endsWith(mimeTable[gz].endsWith) && contentType != mimeTable[gz].mimeType && contentType != mimeTable[none].mimeType) 
-      {
-        sendHeader("Content-Encoding", "gzip");
-      }
-      
-      send(200, contentType, "");
-      
-      return _currentClient.write(file);
-    }
-    #else
+    
+#else
+    
     void serveStatic(const char* uri, fs::FS& fs, const char* path, const char* cache_header = NULL ); // serve static pages from file system
 
     // Handle a GET request by sending a response header and stream file content to response body
@@ -420,7 +404,7 @@ class WiFiWebServer
         }
         return contentLength;
       }
-    #endif    
+#endif    
 
   protected:
     void _addRequestHandler(RequestHandler* handler);
@@ -446,7 +430,7 @@ class WiFiWebServer
     void _prepareHeader(WWString& response, int code, const char* content_type, size_t contentLength);
     bool _collectHeader(const char* headerName, const char* headerValue);
 
-    #if (ESP32 || ESP8266)
+#if (ESP32 || ESP8266)
     void _streamFileCore(const size_t fileSize, const String & fileName, const String & contentType);
 
     template<typename T>
@@ -465,7 +449,7 @@ class WiFiWebServer
 
       return contentLength;
     }
-    #endif
+#endif
 
     struct RequestArgument 
     {
@@ -492,14 +476,14 @@ class WiFiWebServer
     RequestArgument*  _currentArgs      = nullptr;
 
     //KH = nullptr
-    #if USE_NEW_WEBSERVER_VERSION
+#if USE_NEW_WEBSERVER_VERSION
     HTTPUpload*       _currentUpload    = nullptr;
     int               _postArgsLen;
     RequestArgument*  _postArgs         = nullptr;
 
-    #else
+#else
     HTTPUpload        _currentUpload;
-    #endif
+#endif
 
     int               _headerKeysCount;
     RequestArgument*  _currentHeaders   = nullptr;