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
commit733f9c130ecddbfe85b9fcd003b0787b0c6cd589 (patch)
tree3eac1a0c29d15abdc2697add83577d69eab518f0
parent7a17e5b8cad5c3cbb3737bb685bff079c1106778 (diff)
parent954b42849d39da059603d00d1ee8851d25894636 (diff)
downloadprosody-733f9c130ecddbfe85b9fcd003b0787b0c6cd589.tar.gz
prosody-733f9c130ecddbfe85b9fcd003b0787b0c6cd589.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