diff options
| author | Kim Alvefur <zash@zash.se> | 2019-12-24 00:39:45 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-12-24 00:39:45 +0100 |
| commit | 1eabf5bdb449b0312dfa272884e02cc84175775c (patch) | |
| tree | 94b4ebcb9443e8e6751e1903ade3c9dc8ec9d678 /net/websocket/frames.lua | |
| parent | 575cd4c57d062a1addc761aa0036b1db752900a9 (diff) | |
| parent | 8537138d41a6bca5e855040c8928ef2aae59802f (diff) | |
| download | prosody-1eabf5bdb449b0312dfa272884e02cc84175775c.tar.gz prosody-1eabf5bdb449b0312dfa272884e02cc84175775c.zip | |
Merge 0.11->trunk
Diffstat (limited to 'net/websocket/frames.lua')
| -rw-r--r-- | net/websocket/frames.lua | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/websocket/frames.lua b/net/websocket/frames.lua index ba25d261..5e17df07 100644 --- a/net/websocket/frames.lua +++ b/net/websocket/frames.lua @@ -9,20 +9,20 @@ local softreq = require "util.dependencies".softreq; local random_bytes = require "util.random".bytes; -local bit = assert(softreq"bit" or softreq"bit32", - "No bit module found. See https://prosody.im/doc/depends#bitop"); +local bit = require "util.bitcompat"; local band = bit.band; local bor = bit.bor; local bxor = bit.bxor; local lshift = bit.lshift; local rshift = bit.rshift; +local unpack = table.unpack or unpack; -- luacheck: ignore 113 local t_concat = table.concat; local s_byte = string.byte; local s_char= string.char; local s_sub = string.sub; -local s_pack = string.pack; -- luacheck: ignore 143 -local s_unpack = string.unpack; -- luacheck: ignore 143 +local s_pack = string.pack; +local s_unpack = string.unpack; if not s_pack and softreq"struct" then s_pack = softreq"struct".pack; |