From: Sage Weil <sage@redhat.com>
Date: Wed, 30 Mar 2016 01:07:41 +0000 (-0400)
Subject: Merge pull request #7712 from vitek/listbucket_encoding_type_fix
X-Git-Tag: v10.1.1~65
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1ac344462636713ba585d55cf344cb9e5c08bef0;p=ceph.git

Merge pull request #7712 from vitek/listbucket_encoding_type_fix

rgw: S3: set EncodingType in ListBucketResult

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
---

1ac344462636713ba585d55cf344cb9e5c08bef0
diff --cc src/rgw/rgw_rest_s3.cc
index ac96e08c2fa,fd790605429..af0fea04f1f
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@@ -483,22 -303,18 +483,24 @@@ void RGWListBucket_ObjStore_S3::send_ve
  					    : "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 (op_ret >= 0) {
 +    if (objs_container) {
 +      s->formatter->open_array_section("Entries");
 +    }
 +
      vector<RGWObjEnt>::iterator iter;
      for (iter = objs.begin(); iter != objs.end(); ++iter) {
 -      time_t mtime = iter->mtime.sec();
        const char *section_name = (iter->is_delete_marker() ? "DeleteMarker"
  				  : "Version");
 -      s->formatter->open_array_section(section_name);
 +      s->formatter->open_object_section(section_name);
 +      if (objs_container) {
 +        s->formatter->dump_bool("IsDeleteMarker", iter->is_delete_marker());
 +      }
        if (encode_key) {
  	string key_name;
  	url_encode(iter->key.name, key_name);