From: Javier M. Mellid <jmunhoz@igalia.com>
Date: Tue, 27 Oct 2015 10:54:49 +0000 (+0100)
Subject: rgw: add x-amz-request-charged header
X-Git-Tag: v10.0.1~125^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6f960fd39b3433bb7d06b23edda7fcbad1f93ec5;p=ceph.git

rgw: add x-amz-request-charged header

If the request in one Requester Pays bucket succeeds the response has to
include the header 'x-amz-request-charged: requester'.

Fixes: #13427

Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
---

diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc
index e2b1568247c3..8ca63130d8a1 100644
--- a/src/rgw/rgw_rest.cc
+++ b/src/rgw/rgw_rest.cc
@@ -520,6 +520,12 @@ void end_header(struct req_state *s, RGWOp *op, const char *content_type, const
 
   dump_trans_id(s);
 
+  if ((!s->err.is_err()) &&
+      (s->bucket_info.owner != s->user.user_id) &&
+      (s->bucket_info.requester_pays)) {
+    s->cio->print("x-amz-request-charged: requester\r\n");
+  }
+
   if (op) {
     dump_access_control(s, op);
   }