From: yuliyang <yuliyang@cmss.chinamobile.com>
Date: Mon, 27 Aug 2018 11:05:22 +0000 (+0800)
Subject: rgw: etag in rgw copy result response body rather in header
X-Git-Tag: v14.0.1~412^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7e89e4c8795b10570ca5c592d8e9bb54a892b4a4;p=ceph.git

rgw: etag in rgw copy result response body rather in header

Signed-off-by: yuliyang <yuliyang@cmss.chinamobile.com>
---

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index 2bb55e8a521..44579da381b 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -2201,7 +2201,9 @@ void RGWCopyObj_ObjStore_S3::send_response()
 
   if (op_ret == 0) {
     dump_time(s, "LastModified", &mtime);
-    dump_etag(s, etag);
+    if (!etag.empty()) {
+      s->formatter->dump_string("ETag", std::move(etag));
+    }
     s->formatter->close_section();
     rgw_flush_formatter_and_reset(s, s->formatter);
   }