From: Paul Reece <paul@servercloud.com>
Date: Wed, 22 Sep 2021 13:37:23 +0000 (-0400)
Subject: Added comment explaining the change
X-Git-Tag: v17.1.0~214^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2f2fa761b400debe1c6c210162b91e3c2c3dc3f9;p=ceph-ci.git

Added comment explaining the change

Signed-off-by: Paul Reece <paul@reece.cc>
---

diff --git a/src/rgw/rgw_multi.cc b/src/rgw/rgw_multi.cc
index 82c5d0ed2cd..e2f69ac60a7 100644
--- a/src/rgw/rgw_multi.cc
+++ b/src/rgw/rgw_multi.cc
@@ -56,6 +56,7 @@ bool RGWMultiCompleteUpload::xml_end(const char *el) {
 
 XMLObj *RGWMultiXMLParser::alloc_obj(const char *el) {
   XMLObj *obj = NULL;
+  // CompletedMultipartUpload is incorrect but some versions of some libraries use it, see PR #41700
   if (strcmp(el, "CompleteMultipartUpload") == 0 ||
       strcmp(el, "CompletedMultipartUpload") == 0 ||
       strcmp(el, "MultipartUpload") == 0) {
diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 5e6f13aed09..2370213e2f3 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -5888,6 +5888,7 @@ void RGWCompleteMultipart::execute(optional_yield y)
 
   parts = static_cast<RGWMultiCompleteUpload *>(parser.find_first("CompleteMultipartUpload"));
   if (!parts || parts->parts.empty()) {
+    // CompletedMultipartUpload is incorrect but some versions of some libraries use it, see PR #41700
     parts = static_cast<RGWMultiCompleteUpload *>(parser.find_first("CompletedMultipartUpload"));
   }