1 files changed, 33 insertions, 30 deletions

diff --git a/src/zenserver/storage/objectstore/objectstore.cpp b/src/zenserver/storage/objectstore/objectstore.cpp
index d6516fa1a..1115c1cd6 100644
--- a/src/zenserver/storage/objectstore/objectstore.cpp
+++ b/src/zenserver/storage/objectstore/objectstore.cpp
@@ -637,11 +637,7 @@ HttpObjectStoreService::GetObject(HttpRouterRequest& Request, const std::string_
 	}
 
 	HttpRanges Ranges;
-	if (Request.ServerRequest().TryGetRanges(Ranges); Ranges.size() > 1)
-	{
-		// Only a single range is supported
-		return Request.ServerRequest().WriteResponse(HttpResponseCode::BadRequest);
-	}
+	Request.ServerRequest().TryGetRanges(Ranges);
 
 	FileContents File;
 	{
@@ -665,42 +661,49 @@ HttpObjectStoreService::GetObject(HttpRouterRequest& Request, const std::string_
 
 	if (Ranges.empty())
 	{
-		const uint64_t TotalServed = m_TotalBytesServed.fetch_add(FileBuf.Size()) + FileBuf.Size();
-
+		const uint64_t TotalServed = m_TotalBytesServed.fetch_add(FileBuf.GetSize()) + FileBuf.GetSize();
 		ZEN_LOG_DEBUG(LogObj,
 					  "GET - '{}/{}' ({}) [OK] (Served: {})",
 					  BucketName,
 					  RelativeBucketPath,
-					  NiceBytes(FileBuf.Size()),
+					  NiceBytes(FileBuf.GetSize()),
 					  NiceBytes(TotalServed));
-
-		Request.ServerRequest().WriteResponse(HttpResponseCode::OK, HttpContentType::kBinary, FileBuf);
 	}
 	else
 	{
-		const auto	   Range	   = Ranges[0];
-		const uint64_t RangeSize   = 1 + (Range.End - Range.Start);
-		const uint64_t TotalServed = m_TotalBytesServed.fetch_add(RangeSize) + RangeSize;
-
-		ZEN_LOG_DEBUG(LogObj,
-					  "GET - '{}/{}' (Range: {}-{}) ({}/{}) [OK] (Served: {})",
-					  BucketName,
-					  RelativeBucketPath,
-					  Range.Start,
-					  Range.End,
-					  NiceBytes(RangeSize),
-					  NiceBytes(FileBuf.Size()),
-					  NiceBytes(TotalServed));
-
-		MemoryView RangeView = FileBuf.GetView().Mid(Range.Start, RangeSize);
-		if (RangeView.GetSize() != RangeSize)
+		const uint64_t TotalSize   = FileBuf.GetSize();
+		uint64_t	   ServedBytes = 0;
+		for (const HttpRange& Range : Ranges)
 		{
-			return Request.ServerRequest().WriteResponse(HttpResponseCode::BadRequest);
+			const uint64_t RangeEnd = (Range.End != ~uint64_t(0)) ? Range.End : TotalSize - 1;
+			if (RangeEnd < TotalSize && Range.Start <= RangeEnd)
+			{
+				ServedBytes += 1 + (RangeEnd - Range.Start);
+			}
+		}
+		if (ServedBytes > 0)
+		{
+			const uint64_t TotalServed = m_TotalBytesServed.fetch_add(ServedBytes) + ServedBytes;
+			ZEN_LOG_DEBUG(LogObj,
+						  "GET - '{}/{}' (Ranges: {}) ({}/{}) [OK] (Served: {})",
+						  BucketName,
+						  RelativeBucketPath,
+						  Ranges.size(),
+						  NiceBytes(ServedBytes),
+						  NiceBytes(TotalSize),
+						  NiceBytes(TotalServed));
+		}
+		else
+		{
+			ZEN_LOG_DEBUG(LogObj,
+						  "GET - '{}/{}' (Ranges: {}) [416] ({})",
+						  BucketName,
+						  RelativeBucketPath,
+						  Ranges.size(),
+						  NiceBytes(TotalSize));
 		}
-
-		IoBuffer RangeBuf = IoBuffer(IoBuffer::Wrap, RangeView.GetData(), RangeView.GetSize());
-		Request.ServerRequest().WriteResponse(HttpResponseCode::PartialContent, HttpContentType::kBinary, RangeBuf);
 	}
+	Request.ServerRequest().WriteResponse(HttpContentType::kBinary, FileBuf, Ranges);
 }
 
 void