Merge branch 'master' into release/v3.1.x

espressif · Dec 14, 2024 · 3c3ff48 · 3c3ff48
2 parents 8e59a1b + 64b62dc
commit 3c3ff48
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/cores/esp32/esp32-hal-time.c b/cores/esp32/esp32-hal-time.c
@@ -51,16 +51,17 @@ static void setTimeZone(long offset, int daylight) {
 void configTime(long gmtOffset_sec, int daylightOffset_sec, const char *server1, const char *server2, const char *server3) {
   //tcpip_adapter_init();  // Should not hurt anything if already inited
   esp_netif_init();
-  if (sntp_enabled()) {
-    sntp_stop();
-  }
 
 #ifdef CONFIG_LWIP_TCPIP_CORE_LOCKING
   if (!sys_thread_tcpip(LWIP_CORE_LOCK_QUERY_HOLDER)) {
     LOCK_TCPIP_CORE();
   }
 #endif
 
+  if (sntp_enabled()) {
+    sntp_stop();
+  }
+
   sntp_setoperatingmode(SNTP_OPMODE_POLL);
   sntp_setservername(0, (char *)server1);
   sntp_setservername(1, (char *)server2);
@@ -83,16 +84,17 @@ void configTime(long gmtOffset_sec, int daylightOffset_sec, const char *server1,
 void configTzTime(const char *tz, const char *server1, const char *server2, const char *server3) {
   //tcpip_adapter_init();  // Should not hurt anything if already inited
   esp_netif_init();
-  if (sntp_enabled()) {
-    sntp_stop();
-  }
 
 #ifdef CONFIG_LWIP_TCPIP_CORE_LOCKING
   if (!sys_thread_tcpip(LWIP_CORE_LOCK_QUERY_HOLDER)) {
     LOCK_TCPIP_CORE();
   }
 #endif
 
+  if (sntp_enabled()) {
+    sntp_stop();
+  }
+
   sntp_setoperatingmode(SNTP_OPMODE_POLL);
   sntp_setservername(0, (char *)server1);
   sntp_setservername(1, (char *)server2);

diff --git a/libraries/WebServer/src/Parsing.cpp b/libraries/WebServer/src/Parsing.cpp
@@ -187,7 +187,8 @@ bool WebServer::_parseRequest(NetworkClient &client) {
       _currentRaw->status = RAW_WRITE;
 
       while (_currentRaw->totalSize < _clientContentLength) {
-        _currentRaw->currentSize = client.readBytes(_currentRaw->buf, HTTP_RAW_BUFLEN);
+        size_t read_len = std::min(_clientContentLength - _currentRaw->totalSize, (size_t)HTTP_RAW_BUFLEN);
+        _currentRaw->currentSize = client.readBytes(_currentRaw->buf, read_len);
         _currentRaw->totalSize += _currentRaw->currentSize;
         if (_currentRaw->currentSize == 0) {
           _currentRaw->status = RAW_ABORTED;