From: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Date: Wed, 24 Feb 2016 14:56:42 +0000 (+0100)
Subject: rgw: do not enforce Content-Length in response for DELETE on Swift's SLO.
X-Git-Tag: v10.1.0~232^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6fb1ceb8e5f9d897ccc0036e650d175ded95a38e;p=ceph.git

rgw: do not enforce Content-Length in response for DELETE on Swift's SLO.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
---

diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc
index 61667103a3d7..eade8da3505d 100644
--- a/src/rgw/rgw_rest_swift.cc
+++ b/src/rgw/rgw_rest_swift.cc
@@ -846,9 +846,11 @@ void RGWDeleteObj_ObjStore_SWIFT::send_response()
 
   set_req_state_err(s, r);
   dump_errno(s);
-  end_header(s, this);
 
   if (multipart_delete) {
+    end_header(s, this /* RGWOp */, nullptr /* contype */,
+               NO_CONTENT_LENGTH);
+
     if (deleter) {
       bulkdelete_respond(deleter->get_num_deleted(),
                          deleter->get_num_unfound(),
@@ -868,6 +870,8 @@ void RGWDeleteObj_ObjStore_SWIFT::send_response()
 
       bulkdelete_respond(0, 0, { fail_desc }, s->prot_flags, *s->formatter);
     }
+  } else {
+    end_header(s, this);
   }
 
   rgw_flush_formatter_and_reset(s, s->formatter);