aboutsummaryrefslogtreecommitdiffstats
path: root/net/websocket
diff options
context:
space:
mode:
authordaurnimator <quae@daurnimator.com>2014-09-29 13:59:16 -0400
committerdaurnimator <quae@daurnimator.com>2014-09-29 13:59:16 -0400
commitf5f64c67636ac8bfc9e1add666229278c689bf0a (patch)
tree8df3d5f560f6323de29139b602f253e16dddcbeb /net/websocket
parent114ee0900825470efd2a053197e56bb6a4697167 (diff)
parent89a01cc8d9df143ec83a6bafbc4864fb7f3353df (diff)
downloadprosody-f5f64c67636ac8bfc9e1add666229278c689bf0a.tar.gz
prosody-f5f64c67636ac8bfc9e1add666229278c689bf0a.zip
Merge 0.10->trunk
Diffstat (limited to 'net/websocket')
-rw-r--r--net/websocket/frames.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/websocket/frames.lua b/net/websocket/frames.lua
index 8bbddd1c..fa0e130d 100644
--- a/net/websocket/frames.lua
+++ b/net/websocket/frames.lua
@@ -171,7 +171,7 @@ local function parse_close(data)
return code, message
end
-local function build_close(code, message)
+local function build_close(code, message, mask)
local data = pack_uint16be(code);
if message then
assert(#message<=123, "Close reason must be <=123 bytes");
@@ -180,7 +180,7 @@ local function build_close(code, message)
return build_frame({
opcode = 0x8;
FIN = true;
- MASK = true;
+ MASK = mask;
data = data;
});
end