diff options
| author | Kim Alvefur <zash@zash.se> | 2020-11-05 22:31:25 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2020-11-05 22:31:25 +0100 |
| commit | 0c94d96263cffcdbe0cf5ea59ef0b172b32258c2 (patch) | |
| tree | 58547de6e7795740633c1b93e67c217eb621fe8f /net/websocket | |
| parent | 20cb21003f0374e7078e1a29ffb36a7028c6b9ef (diff) | |
| parent | 4afbfc6854ebc374acc34729fdc6e472b44b07f1 (diff) | |
| download | prosody-0c94d96263cffcdbe0cf5ea59ef0b172b32258c2.tar.gz prosody-0c94d96263cffcdbe0cf5ea59ef0b172b32258c2.zip | |
Merge 0.11->trunk
Diffstat (limited to 'net/websocket')
| -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 1d0ac06f..03ce21a8 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 lshift = bit.lshift; @@ -19,8 +18,8 @@ local sbit = require "util.strbitop"; local sxor = sbit.sxor; 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; |