# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1577958767 -3600
# Node ID 6d4562acef811e0dd1006da01f981632dc4ec4c1
# Parent  b7c5d7bae4ef09a64f8c568da2f8dce2def666cb# Parent  10d6d0d91f4ec47a6eb446792fee1d4b79a914d7
Merge 0.11->trunk

diff -r b7c5d7bae4ef -r 6d4562acef81 plugins/mod_websocket.lua
--- a/plugins/mod_websocket.lua	Wed Jan 01 01:22:57 2020 +0100
+++ b/plugins/mod_websocket.lua	Thu Jan 02 10:52:47 2020 +0100
@@ -223,6 +223,7 @@
 			return;
 		elseif opcode == 0x9 then -- Ping frame
 			frame.opcode = 0xA;
+			frame.MASK = false; -- Clients send masked frames, servers don't, see #1484
 			conn:write(build_frame(frame));
 			return "";
 		elseif opcode == 0xA then -- Pong frame, MAY be sent unsolicited, eg as keepalive