summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/plugins/relay/relay-client.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/plugins/relay/relay-client.c b/src/plugins/relay/relay-client.c
index 6153ddfb3..63ae2ed80 100644
--- a/src/plugins/relay/relay-client.c
+++ b/src/plugins/relay/relay-client.c
@@ -488,7 +488,16 @@ relay_client_recv_cb (void *arg_client, int fd)
(unsigned long long)num_read,
(unsigned char *)decoded,
&decoded_length);
- if (!rc || (decoded_length == 0))
+ if (decoded_length == 0)
+ {
+ /* When decoded length is 0, assume client sent a PONG frame.
+ *
+ * RFC 6455 Section 5.5.3
+ * "A Pong frame MAY be sent unsolicited. This serves as a unidirectional heartbeat. A response to an unsolicited Pong frame is not expected."
+ */
+ return WEECHAT_RC_OK;
+ }
+ if (!rc)
{
/* error when decoding frame: close connection */
weechat_printf_tags (NULL, "relay_client",