]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: add x-amz-request-charged header 6214/head
authorJavier M. Mellid <jmunhoz@igalia.com>
Tue, 27 Oct 2015 10:54:49 +0000 (11:54 +0100)
committerJavier M. Mellid <jmunhoz@igalia.com>
Tue, 27 Oct 2015 10:54:49 +0000 (11:54 +0100)
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>
src/rgw/rgw_rest.cc

index e2b1568247c31227412d485b55a3c4731b9abf87..8ca63130d8a1a8378432ddc1c6b6b410e3cb731c 100644 (file)
@@ -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);
   }