From: Yehuda Sadeh <yehuda@hq.newdream.net>
Date: Thu, 21 Oct 2010 16:53:37 +0000 (-0700)
Subject: rgw: return 204 on successful removal of bucket/object
X-Git-Tag: v0.22.1~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=34da1ac8f4d407b87211f068049be2e7d004214c;p=ceph.git

rgw: return 204 on successful removal of bucket/object
---

diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc
index fccc8b0b2cda..00f75c2ddbfc 100644
--- a/src/rgw/rgw_rest.cc
+++ b/src/rgw/rgw_rest.cc
@@ -21,6 +21,7 @@ struct errno_http {
 
 static struct errno_http hterrs[] = {
     { 0, "200", "" },
+    { 204, "204", "NoContent" },
     { 206, "206", "" },
     { EINVAL, "400", "InvalidArgument" },
     { EACCES, "403", "AccessDenied" },
@@ -346,7 +347,11 @@ void RGWCreateBucket_REST::send_response()
 
 void RGWDeleteBucket_REST::send_response()
 {
-  dump_errno(s, ret);
+  int r = ret;
+  if (!r)
+    r = 204;
+
+  dump_errno(s, r);
   end_header(s);
 }
 
@@ -385,7 +390,11 @@ void RGWPutObj_REST::send_response()
 
 void RGWDeleteObj_REST::send_response()
 {
-  dump_errno(s, ret);
+  int r = ret;
+  if (!r)
+    r = 204;
+
+  dump_errno(s, r);
   end_header(s);
 }