]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw/lifecycle: do not send lifecycle rules when GetLifeCycle failed 14528/head
authorliuchang0812 <liuchang0812@gmail.com>
Mon, 27 Mar 2017 05:08:12 +0000 (13:08 +0800)
committerNathan Cutler <ncutler@suse.com>
Mon, 3 Jul 2017 10:52:29 +0000 (12:52 +0200)
Now, RGW will send two HTTP responses when GetLifeCycle failed. The first one is
Error Respnse like 404, and the second is lifecycle rules. It will breaks s3 sdk
and s3 utilities.

Fixes: http://tracker.ceph.com/issues/19363
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
(cherry picked from commit c3c0c828da5a64ca896475c1b0c369fde1bbd76a)

src/rgw/rgw_rest_s3.cc

index 63b100e19a69d87a45fb94adde32fffbe7e98890..85d78e527ae0b30a522b5963a8f266507f3c1360 100644 (file)
@@ -2370,6 +2370,9 @@ void RGWGetLC_ObjStore_S3::send_response()
   end_header(s, this, "application/xml");
   dump_start(s);
 
+  if (op_ret < 0)
+    return;
+
   config.dump_xml(s->formatter);
   rgw_flush_formatter_and_reset(s, s->formatter);
 }