From: Orit Wasserman <owasserm@redhat.com>
Date: Thu, 13 Aug 2015 13:02:03 +0000 (+0200)
Subject: rgw: we should not overide Swift sent content type
X-Git-Tag: v0.94.4~10^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5d57b63c32e43000ff95c2d8ce34347ed0579a8a;p=ceph.git

rgw: we should not overide Swift sent content type

Fixes: #12363
backport: hammer

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit 423cf136f15df3099c9266f55932542d303c2713)
---

diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc
index 7f9472de8cc..ee1c6227aaa 100644
--- a/src/rgw/rgw_rest.cc
+++ b/src/rgw/rgw_rest.cc
@@ -513,7 +513,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;
   }