summaryrefslogtreecommitdiff
path: root/thirdparty/wslay
diff options
context:
space:
mode:
authorFabio Alessandrelli <fabio.alessandrelli@gmail.com>2020-07-02 16:00:56 +0200
committerFabio Alessandrelli <fabio.alessandrelli@gmail.com>2020-07-02 16:00:56 +0200
commitd988b0d1a359b28e088fa9aca5361fdb69a39e66 (patch)
treeb799068afc0dd41c843093dae688a222b7b5c875 /thirdparty/wslay
parentf4aea9353707eb10b8039ae8b2ad8820c5aabe2f (diff)
Update to wslay 1.1.1 .
A minor fix, but let's stay in sync.
Diffstat (limited to 'thirdparty/wslay')
-rw-r--r--thirdparty/wslay/includes/wslay/wslayver.h2
-rw-r--r--thirdparty/wslay/wslay_event.c12
2 files changed, 7 insertions, 7 deletions
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;