aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-01-02 10:52:47 +0100
committerKim Alvefur <zash@zash.se>2020-01-02 10:52:47 +0100
commit09aca1299745f8a4d6a6da85c33f3ed12b6cc49d (patch)
tree3eac1a0c29d15abdc2697add83577d69eab518f0
parent48bb417812710633ce1340e1f0f91366905b2a4f (diff)
parenteb7a71a64584c9d83be6a3c4a24efb39a202830a (diff)
downloadprosody-09aca1299745f8a4d6a6da85c33f3ed12b6cc49d.tar.gz
prosody-09aca1299745f8a4d6a6da85c33f3ed12b6cc49d.zip
Merge 0.11->trunk
-rw-r--r--plugins/mod_websocket.lua1
1 files changed, 1 insertions, 0 deletions
diff --git a/plugins/mod_websocket.lua b/plugins/mod_websocket.lua
index 386a4d60..101039e1 100644
--- a/plugins/mod_websocket.lua
+++ b/plugins/mod_websocket.lua
@@ -223,6 +223,7 @@ function handle_request(event)
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