From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 30 Jun 2016 21:43:40 +0000 (-0400)
Subject: rgw: add tenant to url for RGWRESTStreamWriteRequest
X-Git-Tag: v10.2.3~13^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bff626f7b32b3fe918510c147f88c49ead5007fa;p=ceph.git

rgw: add tenant to url for RGWRESTStreamWriteRequest

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 2a1e1a776c58f62fbcb57877d56b92eb1e8933e6)
---

diff --git a/src/rgw/rgw_rest_client.cc b/src/rgw/rgw_rest_client.cc
index b219e6f15429..e29b16014e97 100644
--- a/src/rgw/rgw_rest_client.cc
+++ b/src/rgw/rgw_rest_client.cc
@@ -607,7 +607,7 @@ int RGWRESTStreamWriteRequest::complete(string& etag, real_time *mtime)
 int RGWRESTStreamRWRequest::get_obj(RGWAccessKey& key, map<string, string>& extra_headers, rgw_obj& obj)
 {
   string urlsafe_bucket, urlsafe_object;
-  url_encode(obj.bucket.name, urlsafe_bucket);
+  url_encode(obj.bucket.get_key(':', 0), urlsafe_bucket);
   url_encode(obj.get_orig_obj(), urlsafe_object);
   string resource = urlsafe_bucket + "/" + urlsafe_object;