]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: we should not overide Swift sent content type 5577/head
authorOrit Wasserman <owasserm@redhat.com>
Thu, 13 Aug 2015 13:02:03 +0000 (15:02 +0200)
committerOrit Wasserman <owasserm@redhat.com>
Thu, 13 Aug 2015 18:50:53 +0000 (20:50 +0200)
Fixes: #12363
backport: hammer

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
src/rgw/rgw_rest.cc

index a03e31fabf2ec243a600d7222b1ec04b8f6503e3..5340e3cb686691ebc7a15b51731c77014036e66b 100644 (file)
@@ -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;
   }