Merge branch 'main' into WebDAVMethods

Author: mathieucarbou

library.json

@@ -1,6 +1,6 @@
 {
   "name": "ESPAsyncWebServer",
-  "version": "3.9.5",
+  "version": "3.9.6",
   "description": "Asynchronous HTTP and WebSocket Server Library for ESP32, ESP8266 and RP2040. Supports: WebSocket, SSE, Authentication, Arduino Json 7, File Upload, Static File serving, URL Rewrite, URL Redirect, etc.",
   "keywords": "http,async,websocket,webserver",
   "homepage": "https://github.com/ESP32Async/ESPAsyncWebServer",

library.properties

@@ -1,6 +1,6 @@
 name=ESP Async WebServer
 includes=ESPAsyncWebServer.h
-version=3.9.5
+version=3.9.6
 author=ESP32Async
 maintainer=ESP32Async
 sentence=Asynchronous HTTP and WebSocket Server Library for ESP32, ESP8266 and RP2040

pioarduino_examples/IncreaseMaxSockets/platformio.ini

@@ -18,7 +18,7 @@ lib_compat_mode = strict
 lib_ldf_mode = chain
 lib_deps =
   ESP32Async/AsyncTCP @ 3.4.10
-  ESP32Async/ESpAsyncWebServer @ 3.9.5
+  ESP32Async/ESpAsyncWebServer @ 3.9.6
 custom_component_remove =
     espressif/esp_hosted
     espressif/esp_wifi_remote

src/AsyncWebServerLogging.h

@@ -81,9 +81,12 @@
 
 /**
  * ESP8266 specific configurations
+ * Uses ets_printf to avoid dependency on global Serial object.
+ * Format strings are stored in PROGMEM and copied to a stack buffer.
  */
 #elif defined(ESP8266)
 #include <ets_sys.h>
+#include <pgmspace.h>
 // define log levels
 #define ASYNC_WS_LOG_NONE    0 /*!< No log output */
 #define ASYNC_WS_LOG_ERROR   1 /*!< Critical errors, software module can not recover on its own */
@@ -96,33 +99,42 @@
 #ifndef ASYNCWEBSERVER_LOG_LEVEL
 #define ASYNCWEBSERVER_LOG_LEVEL ASYNC_WS_LOG_INFO
 #endif
+// helper macro to copy PROGMEM format string to stack and call ets_printf
+// level is a char literal ('E', 'W', etc.) to avoid RAM usage from string literals
+#define _ASYNC_WS_LOG(level, format, ...)                               \
+  do {                                                                  \
+    static const char __fmt[] PROGMEM = "%c async_ws %d: " format "\n"; \
+    char __buf[sizeof(__fmt)];                                          \
+    strcpy_P(__buf, __fmt);                                             \
+    ets_printf(__buf, level, __LINE__, ##__VA_ARGS__);                  \
+  } while (0)
 // error
 #if ASYNCWEBSERVER_LOG_LEVEL >= ASYNC_WS_LOG_ERROR
-#define async_ws_log_e(format, ...) Serial.printf_P(PSTR("E async_ws %d: " format "\n"), __LINE__, ##__VA_ARGS__)
+#define async_ws_log_e(format, ...) _ASYNC_WS_LOG('E', format, ##__VA_ARGS__)
 #else
 #define async_ws_log_e(format, ...)
 #endif
 // warn
 #if ASYNCWEBSERVER_LOG_LEVEL >= ASYNC_WS_LOG_WARN
-#define async_ws_log_w(format, ...) Serial.printf_P(PSTR("W async_ws %d: " format "\n"), __LINE__, ##__VA_ARGS__)
+#define async_ws_log_w(format, ...) _ASYNC_WS_LOG('W', format, ##__VA_ARGS__)
 #else
 #define async_ws_log_w(format, ...)
 #endif
 // info
 #if ASYNCWEBSERVER_LOG_LEVEL >= ASYNC_WS_LOG_INFO
-#define async_ws_log_i(format, ...) Serial.printf_P(PSTR("I async_ws %d: " format "\n"), __LINE__, ##__VA_ARGS__)
+#define async_ws_log_i(format, ...) _ASYNC_WS_LOG('I', format, ##__VA_ARGS__)
 #else
 #define async_ws_log_i(format, ...)
 #endif
 // debug
 #if ASYNCWEBSERVER_LOG_LEVEL >= ASYNC_WS_LOG_DEBUG
-#define async_ws_log_d(format, ...) Serial.printf_P(PSTR("D async_ws %d: " format "\n"), __LINE__, ##__VA_ARGS__)
+#define async_ws_log_d(format, ...) _ASYNC_WS_LOG('D', format, ##__VA_ARGS__)
 #else
 #define async_ws_log_d(format, ...)
 #endif
 // verbose
 #if ASYNCWEBSERVER_LOG_LEVEL >= ASYNC_WS_LOG_VERBOSE
-#define async_ws_log_v(format, ...) Serial.printf_P(PSTR("V async_ws %d: " format "\n"), __LINE__, ##__VA_ARGS__)
+#define async_ws_log_v(format, ...) _ASYNC_WS_LOG('V', format, ##__VA_ARGS__)
 #else
 #define async_ws_log_v(format, ...)
 #endif

src/AsyncWebServerVersion.h

@@ -12,7 +12,7 @@ extern "C" {
 /** Minor version number (x.X.x) */
 #define ASYNCWEBSERVER_VERSION_MINOR 9
 /** Patch version number (x.x.X) */
-#define ASYNCWEBSERVER_VERSION_PATCH 5
+#define ASYNCWEBSERVER_VERSION_PATCH 6
 
 /**
  * Macro to convert version number into an integer