From 423cf136f15df3099c9266f55932542d303c2713 Mon Sep 17 00:00:00 2001 From: Orit Wasserman Date: Thu, 13 Aug 2015 15:02:03 +0200 Subject: [PATCH] rgw: we should not overide Swift sent content type Fixes: #12363 backport: hammer Signed-off-by: Orit Wasserman --- src/rgw/rgw_rest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc index a03e31fabf2ec..5340e3cb68669 100644 --- a/src/rgw/rgw_rest.cc +++ b/src/rgw/rgw_rest.cc @@ -515,7 +515,7 @@ void end_header(struct req_state *s, RGWOp *op, const char *content_type, const dump_access_control(s, op); } - if (s->prot_flags & RGW_REST_SWIFT) { + if (s->prot_flags & RGW_REST_SWIFT && !content_type) { force_content_type = true; } -- 2.47.3