radosgw: Fix duplicate 'Content-Type' when using 'response-content-type'

Signed-off-by: Sylvain Munaut <s.munaut@whatever-company.com>
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index 7a5e941b613ba76f08f9d3787e62f92ef9b9eead..add523a6e9ca85de05400ba81c2aa69e262265ce 100644 (file)
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -117,8 +117,9 @@ int RGWGetObj_ObjStore_S3::send_response_data(bufferlist& bl, off_t bl_ofs, off_
        if (response_attrs.count(aiter->second) > 0) // was already overridden by a response param
          continue;
 
-       if ((!content_type) && aiter->first.compare(RGW_ATTR_CONTENT_TYPE) == 0) { // special handling for content_type
-         content_type = iter->second.c_str();
+       if (aiter->first.compare(RGW_ATTR_CONTENT_TYPE) == 0) { // special handling for content_type
+         if (!content_type)
+           content_type = iter->second.c_str();
          continue;
         }
        response_attrs[aiter->second] = iter->second.c_str();