From: Yehuda Sadeh <yehuda@inktank.com>
Date: Mon, 21 Apr 2014 22:34:04 +0000 (-0700)
Subject: rgw: send user manifest header field
X-Git-Tag: v0.67.9~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0e685c68aa6a500aa7fa433cd9b8246f70c5383e;p=ceph.git

rgw: send user manifest header field

Fixes: #8170
Backport: firefly
If user manifest header exists (swift) send it as part of the object
header data.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
(cherry picked from commit 5cc5686039a882ad345681133c9c5a4a2c2fd86b)
---

diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc
index d3825129fc51..54b06859df3d 100644
--- a/src/rgw/rgw_rest.cc
+++ b/src/rgw/rgw_rest.cc
@@ -35,6 +35,7 @@ static struct rgw_http_attr rgw_to_http_attr_list[] = {
   { RGW_ATTR_CACHE_CONTROL, "Cache-Control"},
   { RGW_ATTR_CONTENT_DISP, "Content-Disposition"},
   { RGW_ATTR_CONTENT_ENC, "Content-Encoding"},
+  { RGW_ATTR_USER_MANIFEST, "X-Object-Manifest"},
   { NULL, NULL},
 };