From 195b71da60e9e0aa410e1a54650b24b105541ea6 Mon Sep 17 00:00:00 2001 From: Scott Simpson Date: Tue, 12 Jul 2011 11:16:52 -0500 Subject: [PATCH] fixed the content type on object server to return what is in the xattrs exactly --- swift/obj/server.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/swift/obj/server.py b/swift/obj/server.py index 50c88a3c42..0592f24d2e 100644 --- a/swift/obj/server.py +++ b/swift/obj/server.py @@ -607,9 +607,10 @@ class ObjectController(object): if_modified_since: file.close() return HTTPNotModified(request=request) - response = Response(content_type=file.metadata.get('Content-Type', - 'application/octet-stream'), app_iter=file, + response = Response(app_iter=file, request=request, conditional_response=True) + response.headers['Content-Type'] = file.metadata.get('Content-Type', + 'application/octet-stream') for key, value in file.metadata.iteritems(): if key.lower().startswith('x-object-meta-') or \ key.lower() in self.allowed_headers: @@ -647,8 +648,9 @@ class ObjectController(object): except (DiskFileError, DiskFileNotExist): file.quarantine() return HTTPNotFound(request=request) - response = Response(content_type=file.metadata['Content-Type'], - request=request, conditional_response=True) + response = Response(request=request, conditional_response=True) + response.headers['Content-Type'] = file.metadata.get('Content-Type', + 'application/octet-stream') for key, value in file.metadata.iteritems(): if key.lower().startswith('x-object-meta-') or \ key.lower() in self.allowed_headers: