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
commitacf786ed7dcca32a0ee768fac6f33d35674fc1b6 (patch)
tree8df3d5f560f6323de29139b602f253e16dddcbeb /net/websocket
parentf03bdbefca10dd64cd70208bf84261fb850d1be8 (diff)
parent0504583316908806a24c975e9acb775a44d2c317 (diff)
downloadprosody-acf786ed7dcca32a0ee768fac6f33d35674fc1b6.tar.gz
prosody-acf786ed7dcca32a0ee768fac6f33d35674fc1b6.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