From 5808c77a0db097fc34d002ebe4c8ee736e7bddf5 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Tue, 27 Jan 2015 15:24:03 -0800 Subject: [PATCH] rgw: don't call send_response() explicitly This will make us send the response twice and clobber the http state. Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_op.cc | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index fd4024ebd957b..e5589303b3546 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -1080,8 +1080,6 @@ void RGWGetBucketVersioning::execute() { versioned = s->bucket_info.versioned(); versioning_enabled = s->bucket_info.versioning_enabled(); - - send_response(); } int RGWSetBucketVersioning::verify_permission() @@ -1102,7 +1100,7 @@ void RGWSetBucketVersioning::execute() ret = get_params(); if (ret < 0) - goto done; + return; if (enable_versioning) { s->bucket_info.flags |= BUCKET_VERSIONED; @@ -1114,11 +1112,8 @@ void RGWSetBucketVersioning::execute() ret = store->put_bucket_instance_info(s->bucket_info, false, 0, &s->bucket_attrs); if (ret < 0) { ldout(s->cct, 0) << "NOTICE: put_bucket_info on bucket=" << s->bucket.name << " returned err=" << ret << dendl; - goto done; + return; } - -done: - send_response(); } int RGWStatBucket::verify_permission() -- 2.39.5