From 2aa1ea6b505c768323abb99dcc8c8f24e594a898 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Thu, 31 Mar 2016 06:24:40 +0000 Subject: [PATCH 1/2] rgw: Multipart ListPartsResult ETag quotes ListPartsResult output has always missed quotes on the ETag since it was first committed. Fixes: #15334 Backports: hammer, infernalis Signed-off-by: Robin H. Johnson (cherry picked from commit a58b774e72cc1613d62e10b25322d6d15e9d2899) --- src/rgw/rgw_rest_s3.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc index 0cc7793ac9ad0..f347d1485d073 100644 --- a/src/rgw/rgw_rest_s3.cc +++ b/src/rgw/rgw_rest_s3.cc @@ -1804,7 +1804,7 @@ void RGWListMultipart_ObjStore_S3::send_response() } s->formatter->dump_unsigned("PartNumber", info.num); - s->formatter->dump_string("ETag", info.etag); + s->formatter->dump_format("ETag", "\"%s\"", info->etag.c_str()); s->formatter->dump_unsigned("Size", info.size); s->formatter->close_section(); } From 2c97cb33c8aa3f53af8a331075a3f79e70113cea Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Thu, 31 Mar 2016 19:48:38 +0800 Subject: [PATCH 2/2] rgw: fix compiling error Signed-off-by: xie xingguo (cherry picked from commit 535eb0e608f3bf6b7c561f277e9977b91ab97b48) --- src/rgw/rgw_rest_s3.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc index f347d1485d073..46232f6b5ef13 100644 --- a/src/rgw/rgw_rest_s3.cc +++ b/src/rgw/rgw_rest_s3.cc @@ -1804,7 +1804,7 @@ void RGWListMultipart_ObjStore_S3::send_response() } s->formatter->dump_unsigned("PartNumber", info.num); - s->formatter->dump_format("ETag", "\"%s\"", info->etag.c_str()); + s->formatter->dump_format("ETag", "\"%s\"", info.etag.c_str()); s->formatter->dump_unsigned("Size", info.size); s->formatter->close_section(); }