From d988b0d1a359b28e088fa9aca5361fdb69a39e66 Mon Sep 17 00:00:00 2001
From: Fabio Alessandrelli <fabio.alessandrelli@gmail.com>
Date: Thu, 2 Jul 2020 16:00:56 +0200
Subject: [PATCH] Update to wslay 1.1.1 .

A minor fix, but let's stay in sync.
---
 thirdparty/README.md                       |  2 +-
 thirdparty/wslay/includes/wslay/wslayver.h |  2 +-
 thirdparty/wslay/wslay_event.c             | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/thirdparty/README.md b/thirdparty/README.md
index c69ca17fd0..bf27854b92 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;