From f84c62069c755d6421f4a6bebcf08b44bfb39815 Mon Sep 17 00:00:00 2001 From: John Dickinson Date: Tue, 26 Oct 2010 14:48:27 -0500 Subject: [PATCH] fixed to ensure x-copied-from header is included --- swift/proxy/server.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/swift/proxy/server.py b/swift/proxy/server.py index e2ecca46ed..bf87386bb4 100644 --- a/swift/proxy/server.py +++ b/swift/proxy/server.py @@ -644,7 +644,7 @@ class ObjectController(Controller): environ=req.environ, headers=req.headers) new_req.content_length = source_resp.content_length 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'] for k, v in source_resp.headers.items(): if k.lower().startswith('x-object-meta-'): @@ -768,8 +768,8 @@ class ObjectController(Controller): bodies.append('') resp = self.best_response(req, statuses, reasons, bodies, 'Object PUT', etag=etag) - if 'x-copy-from' in req.headers: - resp.headers['X-Copied-From'] = req.headers['x-copy-from'] + if source_header: + resp.headers['X-Copied-From'] = source_header for k, v in req.headers.items(): if k.lower().startswith('x-object-meta-'): resp.headers[k] = v