From 991279cd4073aa9b30b79aecccc88da1962e504e Mon Sep 17 00:00:00 2001 From: Trinity Pointard Date: Thu, 25 Nov 2021 18:30:33 +0100 Subject: [PATCH] remove dead code and handle mutli-range by sending whole file --- src/api/s3_get.rs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/api/s3_get.rs b/src/api/s3_get.rs index 10d6591f..0f6feaed 100644 --- a/src/api/s3_get.rs +++ b/src/api/s3_get.rs @@ -158,9 +158,9 @@ pub async fn handle_get( let range_str = range.to_str()?; let mut ranges = http_range::HttpRange::parse(range_str, last_v_meta.size)?; if ranges.len() > 1 { - return Err(Error::BadRequest( - "Multiple ranges not supported".to_string(), - )); + // garage does not support multi-range requests yet, so we respond with the entire + // object when multiple ranges are requested + None } else { ranges.pop() } @@ -235,10 +235,6 @@ async fn handle_get_range( begin: u64, end: u64, ) -> Result, Error> { - if end > version_meta.size { - return Err(Error::BadRequest("Range not included in file".to_string())); - } - let resp_builder = object_headers(version, version_meta) .header("Content-Length", format!("{}", end - begin)) .header(