]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: do not enforce Content-Length in response for DELETE on Swift's SLO.
authorRadoslaw Zarzynski <rzarzynski@mirantis.com>
Wed, 24 Feb 2016 14:56:42 +0000 (15:56 +0100)
committerRadoslaw Zarzynski <rzarzynski@mirantis.com>
Mon, 29 Feb 2016 11:16:42 +0000 (12:16 +0100)
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
src/rgw/rgw_rest_swift.cc

index 61667103a3d76446069ebc2dc32596949e004932..eade8da3505d043e99087640a900ffd93f6ee249 100644 (file)
@@ -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);