From: Casey Bodley <cbodley@redhat.com>
Date: Sun, 19 Jun 2016 18:58:00 +0000 (-0400)
Subject: rgw: s3 PutObj sends status first
X-Git-Tag: v11.1.0~454^2~66
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=04057a088ad937f29a70ea76b7dbad15a0eb61aa;p=ceph.git

rgw: s3 PutObj sends status first

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index 57c28fa205fe..35796d900805 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -1325,6 +1325,7 @@ void RGWPutObj_ObjStore_S3::send_response()
 {
   if (op_ret) {
     set_req_state_err(s, op_ret);
+    dump_errno(s);
   } else {
     if (s->cct->_conf->rgw_s3_success_create_obj_status) {
       op_ret = get_success_retcode(
@@ -1332,6 +1333,7 @@ void RGWPutObj_ObjStore_S3::send_response()
       set_req_state_err(s, op_ret);
     }
     if (!copy_source) {
+      dump_errno(s);
       dump_etag(s, etag.c_str());
       dump_content_length(s, 0);
     } else {
@@ -1357,7 +1359,6 @@ void RGWPutObj_ObjStore_S3::send_response()
   if (s->system_request && !real_clock::is_zero(mtime)) {
     dump_epoch_header(s, "Rgwx-Mtime", mtime);
   }
-  dump_errno(s);
   end_header(s, this);
 }