diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-07-02 23:25:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-02 23:25:17 +0200 |
| commit | c85a51cf87f04ff296678d563dc9299598d2bfae (patch) | |
| tree | ac70ebb6c7af6f2c9767f9a69934ba0578bec56e | |
| parent | f9c2f35dd925eb6620021dc540b1d049c04d7cd4 (diff) | |
| parent | d988b0d1a359b28e088fa9aca5361fdb69a39e66 (diff) | |
Merge pull request #40058 from Faless/wslay/1.1.1
Update to wslay 1.1.1 .
| -rw-r--r-- | thirdparty/README.md | 2 | ||||
| -rw-r--r-- | thirdparty/wslay/includes/wslay/wslayver.h | 2 | ||||
| -rw-r--r-- | thirdparty/wslay/wslay_event.c | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/thirdparty/README.md b/thirdparty/README.md index e9ab0aeb20..43cd448a00 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -623,7 +623,7 @@ Patches in the `patches` directory should be re-applied after updates. ## 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: diff --git a/thirdparty/wslay/includes/wslay/wslayver.h b/thirdparty/wslay/includes/wslay/wslayver.h index 2c3e282e9d..28f2018039 100644 --- a/thirdparty/wslay/includes/wslay/wslayver.h +++ b/thirdparty/wslay/includes/wslay/wslayver.h @@ -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 */ diff --git a/thirdparty/wslay/wslay_event.c b/thirdparty/wslay/wslay_event.c index 57415c51e0..140f7c01da 100644 --- a/thirdparty/wslay/wslay_event.c +++ b/thirdparty/wslay/wslay_event.c @@ -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; |