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

Merge 13.0->trunk

Browse source
This commit is contained in:
Kim Alvefur 2025-03-23 17:24:49 +01:00
commit d3899c1e16
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/mod_http_file_share.lua
View file

@ -429,18 +429,22 @@ function handle_download(event, path) -- GET /uploads/:slot+filename
local request_range = request.headers.range; local request_range = request.headers.range;
local response_range; local response_range;
if request_range then if request_range then
local last_byte = string.format("%d", tonumber(filesize) - 1);
local range_start, range_end = request_range:match("^bytes=(%d+)%-(%d*)$") local range_start, range_end = request_range:match("^bytes=(%d+)%-(%d*)$")
-- Only support resumption, ie ranges from somewhere in the middle until the end of the file. -- Only support resumption, ie ranges from somewhere in the middle until the end of the file.
if (range_start and range_start ~= "0") and (range_end == "" or range_end == filesize) then if (range_start and range_start ~= "0") and (range_end == "" or range_end == last_byte) then
local pos, size = tonumber(range_start), tonumber(filesize); local pos, size = tonumber(range_start), tonumber(filesize);
local new_pos = pos < size and handle:seek("set", pos); local new_pos = pos < size and handle:seek("set", pos);
if new_pos and new_pos < size then if new_pos and new_pos < size then
response_range = "bytes "..range_start.."-"..filesize.."/"..filesize; response_range = "bytes "..range_start.."-"..last_byte.."/"..filesize;
filesize = string.format("%d", size-pos); filesize = string.format("%d", size-pos);
else else
handle:close(); handle:close();
return 416; return 416;
end end
else
handle:close();
return 416;
end end
end end

16
plugins/mod_storage_sql.lua
View file

@ -885,16 +885,12 @@ local function upgrade_table(engine, params, apply_changes) -- luacheck: ignore
end end
end) end)
if indices["prosody_index"] then if indices["prosody_index"] then
if apply_changes then local success = engine:transaction(function ()
local success = engine:transaction(function () return assert(engine:execute([[DROP INDEX "prosody_index";]]));
return assert(engine:execute([[DROP INDEX "prosody_index";]])); end);
end); if not success then
if not success then module:log("error", "Failed to delete obsolete index \"prosody_index\"");
module:log("error", "Failed to delete obsolete index \"prosody_index\""); return false;
return false;
end
else
changes = true;
end end
end end
end end