Deuxfleurs/garage
42
40
Fork 57
Code Issues 77 Pull requests 8 Releases 29 Wiki Activity

Fix #28, extra headers being ignored (because of profound stupidity)
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source
This commit is contained in:
Alex 2021-02-19 12:38:22 +01:00
parent 76390085ef
commit 02d512f3fd
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/api/s3_get.rs
View file

@ -16,6 +16,8 @@ fn object_headers(
version: &ObjectVersion, version: &ObjectVersion,
version_meta: &ObjectVersionMeta, version_meta: &ObjectVersionMeta,
) -> http::response::Builder { ) -> http::response::Builder {
debug!("Version meta: {:?}", version_meta);
let date = UNIX_EPOCH + Duration::from_millis(version.timestamp); let date = UNIX_EPOCH + Duration::from_millis(version.timestamp);
let date_str = httpdate::fmt_http_date(date); let date_str = httpdate::fmt_http_date(date);

4
src/api/s3_put.rs
View file

@ -33,6 +33,8 @@ pub async fn handle_put(
// Retrieve interesting headers from request // Retrieve interesting headers from request
let headers = get_headers(&req)?; let headers = get_headers(&req)?;
debug!("Object headers: {:?}", headers);
let content_md5 = match req.headers().get("content-md5") { let content_md5 = match req.headers().get("content-md5") {
Some(x) => Some(x.to_str()?.to_string()), Some(x) => Some(x.to_str()?.to_string()),
None => None, None => None,
@ -578,7 +580,7 @@ fn get_headers(req: &Request<Body>) -> Result<ObjectVersionHeaders, Error> {
} }
Ok(ObjectVersionHeaders { Ok(ObjectVersionHeaders {
content_type, content_type,
other: BTreeMap::new(), other,
}) })
} }