diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-07-04 15:55:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-04 15:55:33 +0200 |
| commit | 550f436f8fbea86984a845c821270fba78189143 (patch) | |
| tree | 93985664212af0602cea06547273015ee580acc2 /core/io/stream_peer_tcp.cpp | |
| parent | 7b569e91c0c6b84965cad416b8e86dcfdacbcfc4 (diff) | |
| parent | 3380dc963895d1f97d4f06c3a71fe15d1c04d9fe (diff) | |
Merge pull request #30263 from Faless/ws/wslay_pr
Use wslay as a WebSocket library
Diffstat (limited to 'core/io/stream_peer_tcp.cpp')
| -rw-r--r-- | core/io/stream_peer_tcp.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/io/stream_peer_tcp.cpp b/core/io/stream_peer_tcp.cpp index bcdae343b8..a8dd263484 100644 --- a/core/io/stream_peer_tcp.cpp +++ b/core/io/stream_peer_tcp.cpp @@ -217,6 +217,11 @@ Error StreamPeerTCP::read(uint8_t *p_buffer, int p_bytes, int &r_received, bool to_read -= read; total_read += read; + + if (!p_block) { + r_received = total_read; + return OK; + } } } |