From: Yehuda Sadeh <yehuda@inktank.com>
Date: Wed, 6 Nov 2013 02:37:43 +0000 (-0800)
Subject: rgw: add compatibility for MultipartUpload
X-Git-Tag: v0.78~158^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5a44e178e4e5503c9edf0da15a6b4ec968d1184d;p=ceph.git

rgw: add compatibility for MultipartUpload

Fixes: #6677
It seems that there's some external library that uses MultipartUpload
instead of CompleteMultipartUpload, even though it's not part of the
documented api. Support it.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
---

diff --git a/src/rgw/rgw_multi.cc b/src/rgw/rgw_multi.cc
index 05863e37a902..74d18ba7a91d 100644
--- a/src/rgw/rgw_multi.cc
+++ b/src/rgw/rgw_multi.cc
@@ -48,7 +48,8 @@ bool RGWMultiCompleteUpload::xml_end(const char *el) {
 
 XMLObj *RGWMultiXMLParser::alloc_obj(const char *el) {
   XMLObj *obj = NULL;
-  if (strcmp(el, "CompleteMultipartUpload") == 0) {
+  if (strcmp(el, "CompleteMultipartUpload") == 0 ||
+      strcmp(el, "MultipartUpload") == 0) {
     obj = new RGWMultiCompleteUpload();
   } else if (strcmp(el, "Part") == 0) {
     obj = new RGWMultiPart();