]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: return 204 on successful removal of bucket/object
authorYehuda Sadeh <yehuda@hq.newdream.net>
Thu, 21 Oct 2010 16:53:37 +0000 (09:53 -0700)
committerSage Weil <sage@newdream.net>
Thu, 21 Oct 2010 18:18:13 +0000 (11:18 -0700)
src/rgw/rgw_rest.cc

index fccc8b0b2cda0d3613d062f13d1217ac917246dc..00f75c2ddbfcb12452629fe6fbdac055dfacf4a2 100644 (file)
@@ -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);
 }