Skip to content

Commit d89b200

Browse files
authored
Merge pull request #158 from mazgch/fixes_for_arduino_esp32_v3.0.0
Fixes for arduino esp32 v3.0.0
2 parents 917809c + 662d6ab commit d89b200

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

src/tiny_websockets/network/esp32/esp32_tcp.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include <tiny_websockets/network/generic_esp/generic_esp_clients.hpp>
99

1010
#include <WiFi.h>
11+
#include <WiFiClientSecure.h>
1112
#include <HTTPClient.h>
1213

1314
namespace websockets { namespace network {

src/websockets_client.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ namespace websockets {
134134
#ifndef _WS_CONFIG_SKIP_HANDSHAKE_ACCEPT_VALIDATION
135135
result.expectedAcceptKey = crypto::websocketsHandshakeEncodeKey(key);
136136
#endif
137-
return std::move(result);
137+
return result;
138138
}
139139

140140
bool isWhitespace(char ch) {

src/websockets_endpoint.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ namespace internals {
182182

183183
done_reading += numReceived;
184184
}
185-
return std::move(data);
185+
return data;
186186
}
187187

188188
void remaskData(WSString& data, const uint8_t* const maskingKey, uint64_t payloadLength) {
@@ -233,14 +233,14 @@ namespace internals {
233233
frame.opcode = header.opcode;
234234
frame.payload_length = payloadLength;
235235

236-
return std::move(frame);
236+
return frame;
237237
}
238238

239239
WebsocketsMessage WebsocketsEndpoint::handleFrameInStreamingMode(WebsocketsFrame& frame) {
240240
if(frame.isControlFrame()) {
241241
auto msg = WebsocketsMessage::CreateFromFrame(std::move(frame));
242242
this->handleMessageInternally(msg);
243-
return std::move(msg);
243+
return msg;
244244
}
245245
else if(frame.isBeginningOfFragmentsStream()) {
246246
this->_recvMode = RecvMode_Streaming;
@@ -293,7 +293,7 @@ namespace internals {
293293
if(frame.isNormalUnfragmentedMessage() || frame.isControlFrame()) {
294294
auto msg = WebsocketsMessage::CreateFromFrame(std::move(frame));
295295
this->handleMessageInternally(msg);
296-
return std::move(msg);
296+
return msg;
297297
}
298298
else if(frame.isBeginningOfFragmentsStream()) {
299299
return handleFrameInStreamingMode(frame);

0 commit comments

Comments
 (0)