From: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Date: Tue, 17 Mar 2015 13:06:37 +0000 (+0100)
Subject: rgw: dump object metadata in response for COPY request of Swift API.
X-Git-Tag: v9.0.1~112^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c52b75edeaeef19471b9aca772bf08055bf04031;p=ceph.git

rgw: dump object metadata in response for COPY request of Swift API.

Fixes: #10663
Backport: hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
---

diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc
index cc9c39463b87..79319269532a 100644
--- a/src/rgw/rgw_rest_swift.cc
+++ b/src/rgw/rgw_rest_swift.cc
@@ -653,14 +653,17 @@ void RGWCopyObj_ObjStore_SWIFT::dump_copy_info()
 void RGWCopyObj_ObjStore_SWIFT::send_response()
 {
   if (!sent_header) {
-   if (!ret)
+    string content_type;
+    if (!ret)
       ret = STATUS_CREATED;
     set_req_state_err(s, ret);
     dump_errno(s);
     dump_etag(s, etag.c_str());
     dump_last_modified(s, mtime);
     dump_copy_info();
-    end_header(s, this);
+    get_contype_from_attrs(attrs, content_type);
+    dump_object_metadata(s, attrs);
+    end_header(s, this, !content_type.empty() ? content_type.c_str() : "binary/octet-stream");
   } else {
     s->formatter->close_section();
     rgw_flush_formatter(s, s->formatter);