From: Vitja Makarov <vitja.makarov@gmail.com>
Date: Wed, 17 Feb 2016 10:46:18 +0000 (+0300)
Subject: hammer: rgw: S3: set EncodingType in ListBucketResult
X-Git-Tag: v0.94.8~54^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F8987%2Fhead;p=ceph.git

hammer: rgw: S3: set EncodingType in ListBucketResult

Signed-off-by: Victor Makarov <vitja.makarov@gmail.com>
(cherry picked from commit d2e281d2beb0a49aae0fd939f9387cb2af2692c8)
X-Github-PR: 7712
Backport: hammer
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
---

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index 0cc7793ac9ad..ce5d76cc651d 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -263,8 +263,10 @@ void RGWListBucket_ObjStore_S3::send_versioned_response()
   s->formatter->dump_string("IsTruncated", (max && is_truncated ? "true" : "false"));
 
   bool encode_key = false;
-  if (strcasecmp(encoding_type.c_str(), "url") == 0)
+  if (strcasecmp(encoding_type.c_str(), "url") == 0) {
+    s->formatter->dump_string("EncodingType", "url");
     encode_key = true;
+  }
 
   if (ret >= 0) {
     vector<RGWObjEnt>::iterator iter;
@@ -340,8 +342,10 @@ void RGWListBucket_ObjStore_S3::send_response()
   s->formatter->dump_string("IsTruncated", (max && is_truncated ? "true" : "false"));
 
   bool encode_key = false;
-  if (strcasecmp(encoding_type.c_str(), "url") == 0)
+  if (strcasecmp(encoding_type.c_str(), "url") == 0) {
+    s->formatter->dump_string("EncodingType", "url");
     encode_key = true;
+  }
 
   if (ret >= 0) {
     vector<RGWObjEnt>::iterator iter;