diff options
| author | John Dickinson <john.dickinson@rackspace.com> | 2011-08-19 17:14:43 -0500 |
|---|---|---|
| committer | John Dickinson <john.dickinson@rackspace.com> | 2011-08-19 17:14:43 -0500 |
| commit | fe3c43628eb010325933d9f5aa8ad15a5feeabe6 (patch) | |
| tree | d9d18997b463c3aa108be6318b866d2a4ec670d7 | |
| parent | f96efd9b5113251e08c717d91a9700e3d748327b (diff) | |
| download | swift-fe3c43628eb010325933d9f5aa8ad15a5feeabe6.tar.gz | |
updated manifest files to not filter headers returned by the manifest object
| -rw-r--r-- | swift/proxy/server.py | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/swift/proxy/server.py b/swift/proxy/server.py index 9e922c637..109903057 100644 --- a/swift/proxy/server.py +++ b/swift/proxy/server.py @@ -819,13 +819,7 @@ class ObjectController(Controller): yield obj marker = sublisting[-1]['name'] - headers = { - 'X-Object-Manifest': resp.headers['x-object-manifest'], - 'Content-Type': resp.content_type} - for key, value in resp.headers.iteritems(): - if key.lower().startswith('x-object-meta-'): - headers[key] = value - resp = Response(headers=headers, request=req, + resp = Response(headers=resp.headers, request=req, conditional_response=True) if req.method == 'HEAD': # These shenanigans are because webob translates the HEAD @@ -859,20 +853,13 @@ class ObjectController(Controller): content_length = 0 last_modified = resp.last_modified etag = md5().hexdigest() - headers = { - 'X-Object-Manifest': resp.headers['x-object-manifest'], - 'Content-Type': resp.content_type, - 'Content-Length': content_length, - 'ETag': etag} - for key, value in resp.headers.iteritems(): - if key.lower().startswith('x-object-meta-'): - headers[key] = value - resp = Response(headers=headers, request=req, + resp = Response(headers=resp.headers, request=req, conditional_response=True) resp.app_iter = SegmentedIterable(self, lcontainer, listing, resp) resp.content_length = content_length resp.last_modified = last_modified + resp.etag = etag resp.headers['accept-ranges'] = 'bytes' return resp |