diff --git a/lib/AsyncTCP/src/AsyncTCP.cpp b/lib/AsyncTCP/src/AsyncTCP.cpp index 38922404e..8bc88ee31 100644 --- a/lib/AsyncTCP/src/AsyncTCP.cpp +++ b/lib/AsyncTCP/src/AsyncTCP.cpp @@ -78,7 +78,7 @@ typedef struct { }; } lwip_event_packet_t; -static xQueueHandle _async_queue; +static QueueHandle_t _async_queue; static TaskHandle_t _async_service_task_handle = NULL; diff --git a/lib/ESPAsyncWebServer/src/AsyncEventSource.cpp b/lib/ESPAsyncWebServer/src/AsyncEventSource.cpp index fdafb1b7a..04d7a3d50 100644 --- a/lib/ESPAsyncWebServer/src/AsyncEventSource.cpp +++ b/lib/ESPAsyncWebServer/src/AsyncEventSource.cpp @@ -190,7 +190,7 @@ void AsyncEventSourceClient::_queueMessage(AsyncEventSourceMessage *dataMessage) //length() is not thread-safe, thus acquiring the lock before this call.. _lockmq.lock(); if(_messageQueue.length() >= SSE_MAX_QUEUED_MESSAGES){ - ets_printf(String(F("ERROR: Too many messages queued\n")).c_str()); + // ets_printf(String(F("ERROR: Too many messages queued\n")).c_str()); delete dataMessage; } else { _messageQueue.add(dataMessage); diff --git a/lib/ESPAsyncWebServer/src/AsyncWebSocket.cpp b/lib/ESPAsyncWebServer/src/AsyncWebSocket.cpp index 90f14cdbc..182ea0536 100644 --- a/lib/ESPAsyncWebServer/src/AsyncWebSocket.cpp +++ b/lib/ESPAsyncWebServer/src/AsyncWebSocket.cpp @@ -460,7 +460,7 @@ void AsyncWebSocketClient::_queueMessage(std::shared_ptr> b if (_messageQueue.size() >= WS_MAX_QUEUED_MESSAGES) { l.unlock(); - ets_printf("AsyncWebSocketClient::_queueMessage: Too many messages queued, closing connection\n"); + //ets_printf("AsyncWebSocketClient::_queueMessage: Too many messages queued, closing connection\n"); _status = WS_DISCONNECTED; if (_client) _client->close(true); return; @@ -1272,9 +1272,9 @@ AsyncWebSocketResponse::AsyncWebSocketResponse(const String& key, AsyncWebSocket (String&)key += WS_STR_UUID; mbedtls_sha1_context ctx; mbedtls_sha1_init(&ctx); - mbedtls_sha1_starts_ret(&ctx); - mbedtls_sha1_update_ret(&ctx, (const unsigned char*)key.c_str(), key.length()); - mbedtls_sha1_finish_ret(&ctx, hash); + mbedtls_sha1_starts(&ctx); + mbedtls_sha1_update(&ctx, (const unsigned char*)key.c_str(), key.length()); + mbedtls_sha1_finish(&ctx, hash); mbedtls_sha1_free(&ctx); #endif base64_encodestate _state; diff --git a/src/version.h b/src/version.h index d41f8699e..98efed320 100644 --- a/src/version.h +++ b/src/version.h @@ -1 +1 @@ -#define EMSESP_APP_VERSION "3.6.5-test.12" +#define EMSESP_APP_VERSION "3.6.5-test.12a"