Skip to content

Commit f5e0703

Browse files
committed
Fix some issues
1 parent 8c1454c commit f5e0703

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/external/AsyncTCP.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525

2626
const char* const TAG = "AsyncTCP";
2727

28+
#include "Core.h"
2829
#include "Logging.h"
29-
#include "Time.h"
3030
#include "util/TaskUtils.h"
3131

3232
#include "lwip/dns.h"

src/external/AsyncWebServer/AsyncWebSocket.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1120,16 +1120,15 @@ AsyncWebSocketResponse::AsyncWebSocketResponse(std::string_view key, AsyncWebSoc
11201120
return;
11211121
}
11221122

1123-
std::array<char, 33> buffer;
1124-
if (OpenShock::Base64Utils::Encode(hash.data(), hash.size(), buffer.data(), buffer.size() - 1) == 0) {
1123+
std::string base64;
1124+
if (OpenShock::Base64Utils::Encode(hash, base64) == 0) {
11251125
_state = RESPONSE_FAILED;
11261126
return;
11271127
}
1128-
buffer[buffer.size() - 1] = 0; // TODO: Check how long output string actually becomes
11291128

11301129
addHeader(WS_STR_CONNECTION, WS_STR_UPGRADE);
11311130
addHeader(WS_STR_UPGRADE, "websocket");
1132-
addHeader(WS_STR_ACCEPT, buffer.data());
1131+
addHeader(WS_STR_ACCEPT, base64.c_str());
11331132
}
11341133

11351134
void AsyncWebSocketResponse::_respond(AsyncWebServerRequest* request)

0 commit comments

Comments
 (0)