diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-10-02 06:46:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-10-02 06:46:00 +0000 |
| commit | 9b9e50cec05c01927444f3d9f4632b464a8b34a1 (patch) | |
| tree | 622efa87b1ba268e58021f73bcaa6b5491c9fecf | |
| parent | fe69cab3fdcd00367a545276c84b15cd8a6938cf (diff) | |
| parent | 8ab06eb8cc08a6f5905efde5b07cee3e71805a77 (diff) | |
| download | swift-9b9e50cec05c01927444f3d9f4632b464a8b34a1.tar.gz | |
Merge "Set path_info in sub_slo manifest GET requests"
| -rw-r--r-- | swift/proxy/controllers/obj.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/swift/proxy/controllers/obj.py b/swift/proxy/controllers/obj.py index 7fc6d87a8..b8a36dedc 100644 --- a/swift/proxy/controllers/obj.py +++ b/swift/proxy/controllers/obj.py @@ -417,6 +417,7 @@ class ObjectController(Controller): new_req = incoming_req.copy_get() new_req.method = 'GET' new_req.range = None + new_req.path_info = '/'.join(['', account, container, obj]) if partition is None: try: partition = self.app.object_ring.get_part( @@ -427,7 +428,7 @@ class ObjectController(Controller): new_req.path) valid_resp = self.GETorHEAD_base( new_req, _('Object'), self.app.object_ring, partition, - '/'.join(['', account, container, obj])) + new_req.path_info) if 'swift.authorize' in incoming_req.environ: incoming_req.acl = valid_resp.headers.get('x-container-read') |