godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to wslay 1.1.1 . 

A minor fix, but let's stay in sync.

(cherry picked from commit d988b0d1a3)
This commit is contained in:
Fabio Alessandrelli 2020-07-02 16:00:56 +02:00 committed by Rémi Verschelde
parent 9d25668339
commit 45b1234a82
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
thirdparty/README.md vendored
View File

@ -494,7 +494,7 @@ folder.
## wslay
- Upstream: https://github.com/tatsuhiro-t/wslay
- Version: 1.1.0 (2018)
- Version: 1.1.1 (2020)
- License: MIT
File extracted from upstream release tarball:

2
thirdparty/wslay/includes/wslay/wslayver.h vendored
View File

@ -26,6 +26,6 @@
#define WSLAYVER_H
/* Version number of wslay release */
#define WSLAY_VERSION "1.1.0"
#define WSLAY_VERSION "1.1.1"
#endif /* WSLAYVER_H */

12
thirdparty/wslay/wslay_event.c vendored
View File

@ -730,11 +730,11 @@ int wslay_event_recv(wslay_event_context_ptr ctx)
return r;
}
} else if(ctx->imsg->opcode == WSLAY_PING) {
struct wslay_event_msg arg;
arg.opcode = WSLAY_PONG;
arg.msg = msg;
arg.msg_length = ctx->imsg->msg_length;
if((r = wslay_event_queue_msg(ctx, &arg)) &&
struct wslay_event_msg pong_arg;
pong_arg.opcode = WSLAY_PONG;
pong_arg.msg = msg;
pong_arg.msg_length = ctx->imsg->msg_length;
if((r = wslay_event_queue_msg(ctx, &pong_arg)) &&
r != WSLAY_ERR_NO_MORE_MSG) {
ctx->read_enabled = 0;
free(msg);
@ -885,7 +885,7 @@ int wslay_event_send(wslay_event_context_ptr ctx)
r = ctx->omsg->read_callback(ctx, ctx->obuf, sizeof(ctx->obuf),
&ctx->omsg->source,
&eof, ctx->user_data);
if(r == 0) {
if(r == 0 && eof == 0) {
break;
} else if(r < 0) {
ctx->write_enabled = 0;