v1.6.3 to fix decoding error bug

### Releases v1.6.3 1. Fix decoding error bug when using special `&` in data fields. Check [Decoding Error. two times called urlDecode in Parsing-impl.h. #17](#17) 2. Update `Packages' Patches`
khoih-prog · Mar 2, 2022 · 9083b11 · 9083b11
1 parent 4d87c07
commit 9083b11
Show file tree

Hide file tree

Showing 27 changed files with 80 additions and 48 deletions.
diff --git a/README.md b/README.md
@@ -202,7 +202,7 @@ This [**WiFiWebServer library**](https://github.com/khoih-prog/WiFiWebServer) cu
  4. [`Arduino AVR core 1.8.5+`](https://github.com/arduino/ArduinoCore-avr) for Arduino (Use Arduino Board Manager) for AVR boards. [![GitHub release](https://img.shields.io/github/release/arduino/ArduinoCore-avr.svg)](https://github.com/arduino/ArduinoCore-avr/releases/latest)
  5. [`Teensy core v1.56+`](https://www.pjrc.com/teensy/td_download.html) for Teensy (4.1, 4.0, 3.6, 3.5, 3,2, 3.1, 3.0) boards.
  6. [`Arduino SAM DUE core v1.6.12+`](https://github.com/arduino/ArduinoCore-sam) for SAM DUE ARM Cortex-M3 boards.
- 7. [`Arduino SAMD core 1.8.12+`](https://github.com/arduino/ArduinoCore-samd) for SAMD ARM Cortex-M0+ boards. [![GitHub release](https://img.shields.io/github/release/arduino/ArduinoCore-samd.svg)](https://github.com/arduino/ArduinoCore-samd/releases/latest)
+ 7. [`Arduino SAMD core 1.8.13+`](https://github.com/arduino/ArduinoCore-samd) for SAMD ARM Cortex-M0+ boards. [![GitHub release](https://img.shields.io/github/release/arduino/ArduinoCore-samd.svg)](https://github.com/arduino/ArduinoCore-samd/releases/latest)
  8. [`Adafruit SAMD core 1.7.9+`](https://github.com/adafruit/ArduinoCore-samd) for SAMD ARM Cortex-M0+ and M4 boards (Nano 33 IoT, etc.). [![GitHub release](https://img.shields.io/github/release/adafruit/ArduinoCore-samd.svg)](https://github.com/adafruit/ArduinoCore-samd/releases/latest)
  9. [`Seeeduino SAMD core 1.8.2+`](https://github.com/Seeed-Studio/ArduinoCore-samd) for SAMD21/SAMD51 boards (XIAO M0, Wio Terminal, etc.). [![Latest release](https://img.shields.io/github/release/Seeed-Studio/ArduinoCore-samd.svg)](https://github.com/Seeed-Studio/ArduinoCore-samd/releases/latest/)
 
@@ -313,13 +313,13 @@ This file must be copied into the directory:
 
 #### 4. For Arduino SAMD boards
 
- ***To be able to compile, run and automatically detect and display BOARD_NAME on Arduino SAMD (Nano-33-IoT, etc) boards***, you have to copy the whole [Arduino SAMD Packages_Patches](Packages_Patches/arduino/hardware/samd/1.8.12) directory into Arduino SAMD directory (~/.arduino15/packages/arduino/hardware/samd/1.8.12).
+ ***To be able to compile, run and automatically detect and display BOARD_NAME on Arduino SAMD (Nano-33-IoT, etc) boards***, you have to copy the whole [Arduino SAMD Packages_Patches](Packages_Patches/arduino/hardware/samd/1.8.13) directory into Arduino SAMD directory (~/.arduino15/packages/arduino/hardware/samd/1.8.13).
 
 #### For core version v1.8.10+
 
-Supposing the Arduino SAMD version is 1.8.12. Now only one file must be copied into the directory:
+Supposing the Arduino SAMD version is 1.8.13. Now only one file must be copied into the directory:
 
-- `~/.arduino15/packages/arduino/hardware/samd/1.8.12/platform.txt`
+- `~/.arduino15/packages/arduino/hardware/samd/1.8.13/platform.txt`
 
 Whenever a new version is installed, remember to copy this files into the new version directory. For example, new version is x.yy.zz
 
@@ -798,7 +798,7 @@ The following are debug terminal output and screen shot when running example [**
 
 ```
 Starting AdvancedServer on SAMD_NANO_33_IOT
-WiFiWebServer v1.6.2
+WiFiWebServer v1.6.3
 [NN] ===============================
 [NN] 
 Used/default SPI pinout: 
@@ -952,7 +952,7 @@ The terminal output of **SAMD_NANO_33_IOT with WiFiNINA using WiFiNINA_Generic L
 
 ```
 Starting SimpleWebSocket on SAMD_NANO_33_IOT with WiFiNINA using WiFiNINA_Generic Library
-WiFiWebServer v1.6.2
+WiFiWebServer v1.6.3
 Connecting to SSID: HueNet1
 You're connected to the network, IP = 192.168.2.98
 SSID: HueNet1, Signal strength (RSSI):-24 dBm
@@ -986,7 +986,7 @@ The terminal output of **SAMD_NANO_33_IOT with WiFiNINA using WiFiNINA_Generic L
 
 ```
 Starting SimpleHTTPExample on SAMD_NANO_33_IOT with WiFiNINA using WiFiNINA_Generic Library
-WiFiWebServer v1.6.2
+WiFiWebServer v1.6.3
 Connecting to SSID: HueNet1
 You're connected to the network, IP = 192.168.2.98
 SSID: HueNet1, Signal strength (RSSI):-21 dBm
@@ -1046,7 +1046,7 @@ The terminal output of **SAMD_NANO_33_IOT with WiFiNINA using WiFiNINA_Generic L
 
 ```
 Starting DweetPost on SAMD_NANO_33_IOT with WiFiNINA using WiFiNINA_Generic Library
-WiFiWebServer v1.6.2
+WiFiWebServer v1.6.3
 Connecting to SSID: HueNet1
 You're connected to the network, IP = 192.168.2.98
 SSID: HueNet1, Signal strength (RSSI):-22 dBm
@@ -1069,7 +1069,7 @@ The terminal output of **SAMD_NANO_33_IOT with WiFiNINA using WiFiNINA_Generic L
 
 ```
 Starting DweetGet on SAMD_NANO_33_IOT with WiFiNINA using WiFiNINA_Generic Library
-WiFiWebServer v1.6.2
+WiFiWebServer v1.6.3
 Connecting to SSID: HueNet1
 You're connected to the network, IP = 192.168.2.98
 SSID: HueNet1, Signal strength (RSSI):-25 dBm
@@ -1099,7 +1099,7 @@ The terminal output of **SAMD_NANO_33_IOT with WiFiNINA using WiFiNINA_Generic L
 
 ```
 Starting MQTTClient_Auth on SAMD_NANO_33_IOT with WiFiNINA using WiFiNINA_Generic Library
-WiFiWebServer v1.6.2
+WiFiWebServer v1.6.3
 Please upgrade the firmware
 Connecting to WPA SSID: HueNet1
 Connected! IP address: 192.168.2.98
@@ -1120,7 +1120,7 @@ The terminal output of **SAMD_NANO_33_IOT with WiFiNINA using WiFiNINA_Generic L
 ```
 Start MQTT_ThingStream on SAMD_NANO_33_IOT
 Starting MQTTClient_Auth on SAMD_NANO_33_IOT with WiFiNINA using WiFiNINA_Generic Library
-WiFiWebServer v1.6.2
+WiFiWebServer v1.6.3
 Please upgrade the firmware
 Connecting to WPA SSID: HueNet1
 Connected! IP address: 192.168.2.98
@@ -1148,7 +1148,7 @@ The terminal output of **RASPBERRY_PI_PICO with Custom WiFi (ESP8266-AT) using C
 
 ```
 Starting WebClientRepeating on RASPBERRY_PI_PICO with Custom WiFi using Custom WiFi Library
-WiFiWebServer v1.6.2
+WiFiWebServer v1.6.3
 WiFi shield init done
 Connecting to SSID: HueNet1
 You're connected to the network, IP = 192.168.2.76
@@ -1221,7 +1221,7 @@ The following are debug terminal output and screen shot when running example [**
 
 ```
 Starting AdvancedServer on Nano RP2040 Connect with WiFiNINA using WiFiNINA_Generic Library
-WiFiWebServer v1.6.2
+WiFiWebServer v1.6.3
 Connecting to WPA SSID: HueNet1
 HTTP server started @ 192.168.2.130
 H[WIFI] handleClient: New Client
@@ -1350,7 +1350,7 @@ The terminal output of **ESP32_DEV** running [SimpleHTTPExample example](example
 
 ```
 Starting SimpleHTTPExample on ESP32_DEV with ESP WiFi using WiFi Library
-WiFiWebServer v1.6.2
+WiFiWebServer v1.6.3
 Connecting to SSID: HueNet1
 You're connected to the network, IP = 192.168.2.80
 SSID: HueNet1, Signal strength (RSSI):-23 dBm
@@ -1417,7 +1417,7 @@ The following are debug terminal output and screen shot when running example [**
 
 ```
 Starting AdvancedServer on PORTENTA_H7_M7 with Portenta_H7 WiFi
-WiFiWebServer v1.6.2
+WiFiWebServer v1.6.3
 Connecting to WPA SSID: HueNet1
 HTTP server started @ 192.168.2.138
 H[WIFI] String Len = 0, extend to 2048
@@ -1433,7 +1433,7 @@ The terminal output of **PORTENTA_H7_M7 with Portenta_H7 WiFi** running [MQTTCli
 
 ```
 Starting MQTTClient_Auth on PORTENTA_H7_M7 with Portenta_H7 WiFi
-WiFiWebServer v1.6.2
+WiFiWebServer v1.6.3
 Connecting to SSID: HueNet1
 Connected! IP address: 192.168.2.130
 Attempting MQTT connection to broker.emqx.io...connected
@@ -1453,7 +1453,7 @@ The terminal output of **PORTENTA_H7_M7 with Portenta_H7 WiFi** running [WebClie
 
 ```
 Starting WebClientRepeating on PORTENTA_H7_M7 with Portenta_H7 WiFi
-WiFiWebServer v1.6.2
+WiFiWebServer v1.6.3
 Connecting to SSID: HueNet1
 You're connected to the network, IP = 192.168.2.130
 SSID: HueNet1, Signal strength (RSSI):-33 dBm
@@ -1527,7 +1527,7 @@ The following are debug terminal output and screen shot when running example [**
 
 ```
 Starting AdvancedWebServer on ESP32C3_DEV with ESP WiFi using WiFi Library
-WiFiWebServer v1.6.2
+WiFiWebServer v1.6.3
 Connecting to WPA SSID: HueNet1
 HTTP server started @ 192.168.2.86
 HH
@@ -1546,7 +1546,7 @@ The following are debug terminal output and screen shot when running example [**
 
 ```
 Starting AdvancedWebServer on ESP32S3_DEV with ESP WiFi using WiFi Library
-WiFiWebServer v1.6.2
+WiFiWebServer v1.6.3
 Connecting to WPA SSID: HueNet1
 HTTP server started @ 192.168.2.86
 HH
@@ -1620,12 +1620,14 @@ Submit issues to: [WiFiWebServer issues](https://github.com/khoih-prog/WiFiWebSe
 1. Based on and modified from [**Ivan Grokhotkov's ESP8266WebServer**](https://github.com/esp8266/Arduino/tree/master/libraries/ESP8266WebServer)
 2. Thanks to good work of [Miguel Alexandre Wisintainer](https://github.com/tcpipchip) for initiating, inspriring, working with, developing, debugging and testing. Without that, support to nRF52, especially **U-Blox B302 running as nRF52840 and U-Blox B112 running as nRF52832**, has never been started and finished. See [u-blox nina b](https://github.com/khoih-prog/WiFiNINA_Generic/issues/1)
 3. [Adrian McEwen](https://github.com/amcewen) for [HttpClient Library](https://github.com/amcewen/HttpClient) on which the [ArduinoHttpClient Library](https://github.com/arduino-libraries/ArduinoHttpClient) and this [EthernetWebServer library](https://github.com/khoih-prog/EthernetWebServer) are relied.
+4. [RQnet](https://github.com/RQnet) to report issue [Decoding Error. two times called urlDecode in Parsing-impl.h. #17](https://github.com/khoih-prog/WiFiWebServer/issues/17) leading to version v1.6.3 to fix the decoding error bug when using special `&` in data fields.
 
 <table>
   <tr>
     <td align="center"><a href="https://github.com/igrr"><img src="https://github.com/igrr.png" width="100px;" alt="igrr"/><br /><sub><b>⭐️⭐️ Ivan Grokhotkov</b></sub></a><br /></td>
     <td align="center"><a href="https://github.com/amcewen"><img src="https://github.com/amcewen.png" width="100px;" alt="amcewen"/><br /><sub><b>⭐️ Adrian McEwen</b></sub></a><br /></td>
     <td align="center"><a href="https://github.com/tcpipchip"><img src="https://github.com/tcpipchip.png" width="100px;" alt="tcpipchip"/><br /><sub><b>⭐️ Miguel Wisintainer</b></sub></a><br /></td>
+    <td align="center"><a href="https://github.com/RQnet"><img src="https://github.com/RQnet.png" width="100px;" alt="RQnet"/><br /><sub><b>RQnet</b></sub></a><br /></td>
   </tr> 
 </table>
 

diff --git a/changelog.md b/changelog.md
@@ -12,6 +12,7 @@
 ## Table of Contents
 
 * [Changelog](#changelog)
+  * [Releases v1.6.3](#releases-v163)
   * [Releases v1.6.2](#releases-v162)
   * [Releases v1.6.1](#releases-v161)
   * [Releases v1.6.0](#releases-v160)
@@ -42,6 +43,12 @@
 
 ## Changelog
 
+### Releases v1.6.3
+
+1. Fix decoding error bug when using special `&` in data fields. Check [Decoding Error. two times called urlDecode in Parsing-impl.h. #17](https://github.com/khoih-prog/WiFiWebServer/issues/17)
+2. Update `Packages' Patches`
+
+
 ### Releases v1.6.2
 
 1. Add support to megaAVR boards (UNO_WIFI_REV2, NANO_EVERY) using [Arduino megaAVR core](https://github.com/arduino/ArduinoCore-megaavr)

diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "WiFiWebServer",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "keywords": "wifi, wi-fi, WebServer, WiFiNINA, WiFi101, ESP32, Portenta-H7, SAM-DUE, SAMD, STM32, nRF52, rpi-pico, rp2040, HTTP-Client, WebSocket-Client, server, client, websocket, AVR, mega-avr",
   "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":

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=WiFiWebServer
-version=1.6.2
+version=1.6.3
 author=Khoi Hoang
 license=MIT
 maintainer=Khoi Hoang <khoih.prog@gmail.com>

diff --git a/src/Parsing-impl.h b/src/Parsing-impl.h
@@ -12,7 +12,7 @@
   @file       Esp8266WebServer.h
   @author     Ivan Grokhotkov
 
-  Version: 1.6.2
+  Version: 1.6.3
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -21,6 +21,7 @@
   1.6.0   K Hoang      13/02/2022 Add support to new ESP32-S3 and ESP32_C3
   1.6.1   K Hoang      13/02/2022 Fix v1.6.0 issue
   1.6.2   K Hoang      22/02/2022 Add support to megaAVR using Arduino megaAVR core
+  1.6.3   K Hoang      02/03/2022 Fix decoding error bug
  ***************************************************************************************************************************************/
 
 #pragma once
@@ -154,7 +155,7 @@ bool WiFiWebServer::_parseRequest(WiFiClient& client)
 
   if (hasSearch != -1)
   {
-    searchStr = urlDecode(url.substring(hasSearch + 1));
+    searchStr = url.substring(hasSearch + 1);
     url = url.substring(0, hasSearch);
   }
 

diff --git a/src/WiFiHttpClient.h b/src/WiFiHttpClient.h
@@ -12,7 +12,7 @@
   @file       Esp8266WebServer.h
   @author     Ivan Grokhotkov
 
-  Version: 1.6.2
+  Version: 1.6.3
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -21,6 +21,7 @@
   1.6.0   K Hoang      13/02/2022 Add support to new ESP32-S3 and ESP32_C3
   1.6.1   K Hoang      13/02/2022 Fix v1.6.0 issue
   1.6.2   K Hoang      22/02/2022 Add support to megaAVR using Arduino megaAVR core
+  1.6.3   K Hoang      02/03/2022 Fix decoding error bug
  *****************************************************************************************************************************/
 
 // Library to simplify HTTP fetching on Arduino

diff --git a/src/WiFiWebServer-impl.h b/src/WiFiWebServer-impl.h
@@ -12,7 +12,7 @@
   @file       Esp8266WebServer.h
   @author     Ivan Grokhotkov
 
-  Version: 1.6.2
+  Version: 1.6.3
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -21,6 +21,7 @@
   1.6.0   K Hoang      13/02/2022 Add support to new ESP32-S3 and ESP32_C3
   1.6.1   K Hoang      13/02/2022 Fix v1.6.0 issue
   1.6.2   K Hoang      22/02/2022 Add support to megaAVR using Arduino megaAVR core
+  1.6.3   K Hoang      02/03/2022 Fix decoding error bug
  ***************************************************************************************************************************************/
 
 #pragma once

diff --git a/src/WiFiWebServer.h b/src/WiFiWebServer.h
@@ -12,7 +12,7 @@
   @file       Esp8266WebServer.h
   @author     Ivan Grokhotkov
 
-  Version: 1.6.2
+  Version: 1.6.3
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -21,6 +21,7 @@
   1.6.0   K Hoang      13/02/2022 Add support to new ESP32-S3 and ESP32_C3
   1.6.1   K Hoang      13/02/2022 Fix v1.6.0 issue
   1.6.2   K Hoang      22/02/2022 Add support to megaAVR using Arduino megaAVR core
+  1.6.3   K Hoang      02/03/2022 Fix decoding error bug
  ***************************************************************************************************************************************/
 
 #pragma once
@@ -29,13 +30,13 @@
 #define WiFiWebServer_H
 
 #ifndef WIFI_WEBSERVER_VERSION
-  #define WIFI_WEBSERVER_VERSION          "WiFiWebServer v1.6.2"
+  #define WIFI_WEBSERVER_VERSION          "WiFiWebServer v1.6.3"
 
   #define WIFI_WEBSERVER_VERSION_MAJOR    1
   #define WIFI_WEBSERVER_VERSION_MINOR    6
-  #define WIFI_WEBSERVER_VERSION_PATCH    2
+  #define WIFI_WEBSERVER_VERSION_PATCH    3
 
-  #define WIFI_WEBSERVER_VERSION_INT      1006002
+  #define WIFI_WEBSERVER_VERSION_INT      1006003
 #endif
 
 #define USE_NEW_WEBSERVER_VERSION       true

diff --git a/src/WiFi_HTTPClient/WiFi_HttpClient.cpp b/src/WiFi_HTTPClient/WiFi_HttpClient.cpp
@@ -12,7 +12,7 @@
   @file       Esp8266WebServer.h
   @author     Ivan Grokhotkov
 
-  Version: 1.6.2
+  Version: 1.6.3
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -21,6 +21,7 @@
   1.6.0   K Hoang      13/02/2022 Add support to new ESP32-S3 and ESP32_C3
   1.6.1   K Hoang      13/02/2022 Fix v1.6.0 issue
   1.6.2   K Hoang      22/02/2022 Add support to megaAVR using Arduino megaAVR core
+  1.6.3   K Hoang      02/03/2022 Fix decoding error bug
  ***************************************************************************************************************************************/
 
 // Class to simplify HTTP fetching on Arduino

diff --git a/src/WiFi_HTTPClient/WiFi_HttpClient.h b/src/WiFi_HTTPClient/WiFi_HttpClient.h
@@ -12,7 +12,7 @@
   @file       Esp8266WebServer.h
   @author     Ivan Grokhotkov
 
-  Version: 1.6.2
+  Version: 1.6.3
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -21,6 +21,7 @@
   1.6.0   K Hoang      13/02/2022 Add support to new ESP32-S3 and ESP32_C3
   1.6.1   K Hoang      13/02/2022 Fix v1.6.0 issue
   1.6.2   K Hoang      22/02/2022 Add support to megaAVR using Arduino megaAVR core
+  1.6.3   K Hoang      02/03/2022 Fix decoding error bug
  ***************************************************************************************************************************************/
 
 // Class to simplify HTTP fetching on Arduino

diff --git a/src/WiFi_HTTPClient/WiFi_URLEncoder.cpp b/src/WiFi_HTTPClient/WiFi_URLEncoder.cpp
@@ -12,7 +12,7 @@
   @file       Esp8266WebServer.h
   @author     Ivan Grokhotkov
 
-  Version: 1.6.2
+  Version: 1.6.3
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -21,6 +21,7 @@
   1.6.0   K Hoang      13/02/2022 Add support to new ESP32-S3 and ESP32_C3
   1.6.1   K Hoang      13/02/2022 Fix v1.6.0 issue
   1.6.2   K Hoang      22/02/2022 Add support to megaAVR using Arduino megaAVR core
+  1.6.3   K Hoang      02/03/2022 Fix decoding error bug
  ***************************************************************************************************************************************/
 
 // Library to simplify HTTP fetching on Arduino

diff --git a/src/WiFi_HTTPClient/WiFi_URLEncoder.h b/src/WiFi_HTTPClient/WiFi_URLEncoder.h
@@ -12,7 +12,7 @@
   @file       Esp8266WebServer.h
   @author     Ivan Grokhotkov
 
-  Version: 1.6.2
+  Version: 1.6.3
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -21,6 +21,7 @@
   1.6.0   K Hoang      13/02/2022 Add support to new ESP32-S3 and ESP32_C3
   1.6.1   K Hoang      13/02/2022 Fix v1.6.0 issue
   1.6.2   K Hoang      22/02/2022 Add support to megaAVR using Arduino megaAVR core
+  1.6.3   K Hoang      02/03/2022 Fix decoding error bug
  ***************************************************************************************************************************************/
 
 // Library to simplify HTTP fetching on Arduino

diff --git a/src/WiFi_HTTPClient/WiFi_WebSocketClient.cpp b/src/WiFi_HTTPClient/WiFi_WebSocketClient.cpp
@@ -12,7 +12,7 @@
   @file       Esp8266WebServer.h
   @author     Ivan Grokhotkov
 
-  Version: 1.6.2
+  Version: 1.6.3
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -21,6 +21,7 @@
   1.6.0   K Hoang      13/02/2022 Add support to new ESP32-S3 and ESP32_C3
   1.6.1   K Hoang      13/02/2022 Fix v1.6.0 issue
   1.6.2   K Hoang      22/02/2022 Add support to megaAVR using Arduino megaAVR core
+  1.6.3   K Hoang      02/03/2022 Fix decoding error bug
  ***************************************************************************************************************************************/
 
 // (c) Copyright Arduino. 2016