Merge branch 'master' into fix/example-simple-time

espressif · Feb 20, 2024 · 835d7fa · 835d7fa
2 parents 66e3969 + 1847723
commit 835d7fa
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/cores/esp32/io_pin_remap.h b/cores/esp32/io_pin_remap.h
@@ -76,6 +76,7 @@ int8_t gpioNumberToDigitalPin(int8_t gpioNumber);
 
 // cores/esp32/esp32-hal-rmt.h
 #define rmtInit(pin, channel_direction, memsize, frequency_Hz)                      rmtInit(digitalPinToGPIONumber(pin), channel_direction, memsize, frequency_Hz)
+#define rmtSetEOT(pin, EOT_Level)                                                   rmtSetEOT(digitalPinToGPIONumber(pin), EOT_Level) 
 #define rmtWrite(pin, data, num_rmt_symbols, timeout_ms)                            rmtWrite(digitalPinToGPIONumber(pin), data, num_rmt_symbols, timeout_ms)
 #define rmtWriteAsync(pin, data, num_rmt_symbols)                                   rmtWriteAsync(digitalPinToGPIONumber(pin), data, num_rmt_symbols)
 #define rmtWriteLooping(pin, data, num_rmt_symbols)                                 rmtWriteLooping(digitalPinToGPIONumber(pin), data, num_rmt_symbols)

diff --git a/docs/en/migration_guides/2.x_to_3.0.rst b/docs/en/migration_guides/2.x_to_3.0.rst
@@ -90,6 +90,7 @@ Removed APIs
 New APIs
 ********
 
+* ``rmtSetEOT``
 * ``rmtWriteAsync``
 * ``rmtTransmitCompleted``
 * ``rmtSetRxMinThreshold``

diff --git a/libraries/WebServer/src/Parsing.cpp b/libraries/WebServer/src/Parsing.cpp
@@ -368,10 +368,12 @@ bool WebServer::_parseForm(WiFiClient& client, String boundary, uint32_t len){
           argType = FPSTR(mimeTable[txt].mimeType);
           line = client.readStringUntil('\r');
           client.readStringUntil('\n');
-          if (line.length() > 12 && line.substring(0, 12).equalsIgnoreCase(FPSTR(Content_Type))){
-            argType = line.substring(line.indexOf(':')+2);
-            //skip next line
-            client.readStringUntil('\r');
+          while (line.length() > 0) {
+            if (line.length() > 12 && line.substring(0, 12).equalsIgnoreCase(FPSTR(Content_Type))){
+              argType = line.substring(line.indexOf(':')+2);
+            }
+            //skip over any other headers
+            line = client.readStringUntil('\r');
             client.readStringUntil('\n');
           }
           log_v("PostArg Type: %s", argType.c_str());