aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2021-02-19 12:38:22 +0100
committerAlex Auvolat <alex@adnab.me>2021-02-19 12:38:22 +0100
commit02d512f3fd3bf78b1a0efe410c0704565cab6470 (patch)
tree4408fc960967a27f5851e99d8775243903e1f7cf
parent76390085ef7cc0a8879e9edc039b536f90d5aa59 (diff)
downloadgarage-02d512f3fd3bf78b1a0efe410c0704565cab6470.tar.gz
garage-02d512f3fd3bf78b1a0efe410c0704565cab6470.zip
Fix #28, extra headers being ignored (because of profound stupidity)
-rw-r--r--src/api/s3_get.rs2
-rw-r--r--src/api/s3_put.rs4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/api/s3_get.rs b/src/api/s3_get.rs
index 1a23f476..68e7c66a 100644
--- a/src/api/s3_get.rs
+++ b/src/api/s3_get.rs
@@ -16,6 +16,8 @@ fn object_headers(
version: &ObjectVersion,
version_meta: &ObjectVersionMeta,
) -> http::response::Builder {
+ debug!("Version meta: {:?}", version_meta);
+
let date = UNIX_EPOCH + Duration::from_millis(version.timestamp);
let date_str = httpdate::fmt_http_date(date);
diff --git a/src/api/s3_put.rs b/src/api/s3_put.rs
index 656d84a9..8ad17cfc 100644
--- a/src/api/s3_put.rs
+++ b/src/api/s3_put.rs
@@ -33,6 +33,8 @@ pub async fn handle_put(
// Retrieve interesting headers from request
let headers = get_headers(&req)?;
+ debug!("Object headers: {:?}", headers);
+
let content_md5 = match req.headers().get("content-md5") {
Some(x) => Some(x.to_str()?.to_string()),
None => None,
@@ -578,7 +580,7 @@ fn get_headers(req: &Request<Body>) -> Result<ObjectVersionHeaders, Error> {
}
Ok(ObjectVersionHeaders {
content_type,
- other: BTreeMap::new(),
+ other,
})
}