openstack/swift
Code Issues Proposed changes

Merge "add utf-8 charset to multipart-manifest=get resp"

Browse Source
This commit is contained in:
Jenkins 2013-07-31 02:03:49 +00:00 committed by Gerrit Code Review
commit efe8d0105c
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
swift/proxy/controllers/obj.py
View File

@ -521,6 +521,7 @@ class ObjectController(Controller):
'X-Copy-From' not in req.headers and \
self.app.allow_static_large_object:
resp.content_type = 'application/json'
resp.charset = 'utf-8'
if config_true_value(resp.headers.get('x-static-large-object')) and \
req.params.get('multipart-manifest') != 'get' and \

1
test/unit/proxy/test_server.py
View File

@ -1275,6 +1275,7 @@ class TestObjectController(unittest.TestCase):
self.assertEqual(resp.status_int, 200)
self.assertEqual(resp.body, json_listing)
self.assertEqual(resp.content_type, 'application/json')
self.assertEqual(resp.charset.lower(), 'utf-8')
self.assertEqual(
requested,