RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-26 21:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28873 from albIN7/liv3

Browse Source 
rgw: fix bugs in listobjectsv1

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
This commit is contained in:
Casey Bodley 2019-07-09 08:45:05 -04:00 committed by GitHub
commit 64cef4caee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/rgw/rgw_rest_s3.cc
View File

@ -839,21 +839,11 @@ return 0;
void RGWListBucket_ObjStore_S3::send_common_versioned_response()
{
if (!s->bucket_tenant.empty()) {
s->formatter->dump_string("Tenant", s->bucket_tenant);
}
s->formatter->dump_string("Name", s->bucket_name);
s->formatter->dump_string("Prefix", prefix);
s->formatter->dump_string("KeyMarker", marker.name);
s->formatter->dump_string("VersionIdMarker", marker.instance);
if (is_truncated && !next_marker.empty()) {
s->formatter->dump_string("NextKeyMarker", next_marker.name);
if (next_marker.instance.empty())
s->formatter->dump_string("NextVersionIdMarker", "null");
else
s->formatter->dump_string("NextVersionIdMarker", next_marker.instance);
}
s->formatter->dump_int("MaxKeys", max);
if (!delimiter.empty()) {
s->formatter->dump_string("Delimiter", delimiter);
@ -889,7 +879,6 @@ void RGWListBucket_ObjStore_S3::send_versioned_response()
s->formatter->dump_string("NextVersionIdMarker", next_marker.instance);
}
}
bool encode_key = false;
if (strcasecmp(encoding_type.c_str(), "url") == 0) {
s->formatter->dump_string("EncodingType", "url");
@ -947,10 +936,9 @@ void RGWListBucket_ObjStore_S3::send_versioned_response()
}
s->formatter->close_section();
}
s->formatter->close_section();
rgw_flush_formatter_and_reset(s, s->formatter);
}
rgw_flush_formatter_and_reset(s, s->formatter);
}