diff options
| author | Matthew Wild <mwild1@gmail.com> | 2020-09-30 09:50:33 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2020-09-30 09:50:33 +0100 |
| commit | 785c20f6ee7e61a5a91a8b6259623bc2a2bbffaa (patch) | |
| tree | 3a37db7b805b1555d08cc61c7938cf512ff35ce0 /net/websocket/frames.lua | |
| parent | e55d037cdf89efac99c6144b381c9fa880f7fb93 (diff) | |
| parent | b80ff2ae4f86aa26e055890a8284b55170ef2056 (diff) | |
| download | prosody-785c20f6ee7e61a5a91a8b6259623bc2a2bbffaa.tar.gz prosody-785c20f6ee7e61a5a91a8b6259623bc2a2bbffaa.zip | |
Merge 0.11->trunk
Diffstat (limited to 'net/websocket/frames.lua')
| -rw-r--r-- | net/websocket/frames.lua | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/websocket/frames.lua b/net/websocket/frames.lua index a0c0d4cd..a0f3bd89 100644 --- a/net/websocket/frames.lua +++ b/net/websocket/frames.lua @@ -9,8 +9,7 @@ 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; @@ -20,8 +19,8 @@ local unpack = table.unpack or unpack; -- luacheck: ignore 113 local t_concat = table.concat; local s_char= string.char; -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; |