changeset 14074:b688908622a1

Merge 13.0->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 13 Feb 2026 15:22:46 +0100
parents beb5a667c20d (current diff) dfbc60d47668 (diff)
children 7a31775f1d7f
files plugins/mod_http_file_share.lua
diffstat 1 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/mod_http_file_share.lua	Wed Feb 11 15:36:28 2026 +0000
+++ b/plugins/mod_http_file_share.lua	Fri Feb 13 15:22:46 2026 +0100
@@ -433,23 +433,22 @@
 
 	local request_range = request.headers.range;
 	local response_range;
-	if request_range then
-		local last_byte = string.format("%d", tonumber(filesize) - 1);
+	-- "bytes=0-" just means "the whole file", so ignore it along with non-byte-range requests
+	if request_range and request_range ~= "bytes=0-" and request_range:find("^bytes=") then
+		local size = tonumber(filesize);
+		local last_byte = string.format("%d", size - 1);
 		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.
-		if (range_start and range_start ~= "0") and (range_end == "" or range_end == last_byte) then
-			local pos, size = tonumber(range_start), tonumber(filesize);
+		if range_end == "" or range_end == last_byte then
+			local pos = tonumber(range_start);
 			local new_pos = pos < size and handle:seek("set", pos);
 			if new_pos and new_pos < size then
-				response_range = "bytes "..range_start.."-"..last_byte.."/"..filesize;
+				response_range = string.format("bytes %d-%d/%s", range_start, last_byte, filesize);
 				filesize = string.format("%d", size-pos);
 			else
 				handle:close();
 				return 416;
 			end
-		else
-			handle:close();
-			return 416;
 		end
 	end