mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.11->trunk

Browse source
This commit is contained in:
Kim Alvefur 2020-10-12 21:29:20 +02:00
commit b0393fe9e1
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
net/websocket/frames.lua
View file

@ -75,7 +75,7 @@ if s_unpack then
end
local function parse_frame_header(frame)
if #frame < 2 then return; end
if frame:len() < 2 then return; end
local byte1, byte2 = frame:byte(1, 2);
local result = {
@ -97,7 +97,7 @@ local function parse_frame_header(frame)
end
local header_length = 2 + length_bytes + (result.MASK and 4 or 0);
if #frame < header_length then return; end
if frame:len() < header_length then return; end
if length_bytes == 2 then
result.length = read_uint16be(frame, 3);
@ -140,7 +140,7 @@ end
local function parse_frame(frame)
local result, pos = parse_frame_header(frame);
if result == nil or #frame < (pos + result.length) then return nil, nil, result; end
if result == nil or frame:len() < (pos + result.length) then return nil, nil, result; end
result.data = parse_frame_body(frame, result, pos+1);
return result, pos + result.length;
end

1
spec/util_dbuffer_spec.lua
View file

@ -42,6 +42,7 @@ describe("util.dbuffer", function ()
assert.truthy(b:write("hello world"));
assert.truthy(b:discard(6));
assert.equal(5, b:length());
assert.equal(5, b:len());
assert.equal("world", b:read(5));
end);
end);

1
util/dbuffer.lua
View file

@ -135,6 +135,7 @@ end
function dbuffer_methods:length()
return self._length;
end
dbuffer_methods.len = dbuffer_methods.length; -- strings have :len()
dynamic_buffer_mt.__len = dbuffer_methods.length; -- support # operator
function dbuffer_methods:collapse(bytes)