openstack/swift
Code Issues Proposed changes

fixed to ensure x-copied-from header is included

Browse Source
This commit is contained in:
John Dickinson
2010-10-26 14:48:27 -05:00
parent 1d33f92abc
commit f84c62069c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
swift/proxy/server.py
View File

@@ -644,7 +644,7 @@ class ObjectController(Controller):
environ=req.environ, headers=req.headers) environ=req.environ, headers=req.headers)
new_req.content_length = source_resp.content_length new_req.content_length = source_resp.content_length
new_req.etag = source_resp.etag new_req.etag = source_resp.etag
#new_req.headers['X-Copy-From'] = source_header.split('/', 2)[2] # we no longer need the X-Copy-From header
del new_req.headers['X-Copy-From'] del new_req.headers['X-Copy-From']
for k, v in source_resp.headers.items(): for k, v in source_resp.headers.items():
if k.lower().startswith('x-object-meta-'): if k.lower().startswith('x-object-meta-'):
@@ -768,8 +768,8 @@ class ObjectController(Controller):
bodies.append('') bodies.append('')
resp = self.best_response(req, statuses, reasons, bodies, 'Object PUT', resp = self.best_response(req, statuses, reasons, bodies, 'Object PUT',
etag=etag) etag=etag)
if 'x-copy-from' in req.headers: if source_header:
resp.headers['X-Copied-From'] = req.headers['x-copy-from'] resp.headers['X-Copied-From'] = source_header
for k, v in req.headers.items(): for k, v in req.headers.items():
if k.lower().startswith('x-object-meta-'): if k.lower().startswith('x-object-meta-'):
resp.headers[k] = v resp.headers[k] = v