summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Benjamin <mbenjamin@redhat.com>2024-10-13 00:20:31 +0200
committerMatt Benjamin <mbenjamin@redhat.com>2025-01-08 01:17:21 +0100
commit1be4399edda33c381a727c51e1d232b3ea8f773b (patch)
treebad061a535fe406389b065c2f94be68f649d3e9e
parentrgw_cksum: permit fallback to checksum-type from create-multipart, in upload-... (diff)
downloadceph-1be4399edda33c381a727c51e1d232b3ea8f773b.tar.xz
ceph-1be4399edda33c381a727c51e1d232b3ea8f773b.zip
rgw_cksum: return version_id in all cases
The version_id member in RGWGetObjAttrs shadows the one in RGWGetObj. Just assign it before conditionally returning the version-id header in RGWGetObjAttrs_ObjStore_S3::send_response(). Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
-rw-r--r--src/rgw/rgw_rest_s3.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index da02c5a6256..234c26abbda 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -3865,6 +3865,8 @@ void RGWGetObjAttrs_ObjStore_S3::send_response()
dump_errno(s);
if (op_ret == 0) {
+ version_id = s->object->get_instance();
+
// x-amz-delete-marker: DeleteMarker // not sure we can plausibly do this?
dump_last_modified(s, lastmod);
dump_header_if_nonempty(s, "x-amz-version-id", version_id);