Ensure we only send a single content-type header

Fixes bug 917438 Change-Id: Ic71bd139f77ed7f291eca258c123deb30c7177ce
openstack · Jan 19, 2012 · b712949 · b712949
1 parent e893b24
commit b712949
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/glance/common/wsgi.py b/glance/common/wsgi.py
@@ -430,7 +430,7 @@ def sanitizer(obj):
         return json.dumps(data, default=sanitizer)
 
     def default(self, response, result):
-        response.headers.add('Content-Type', 'application/json')
+        response.content_type = 'application/json'
         response.body = self.to_json(result)
 
 

diff --git a/glance/tests/unit/test_wsgi.py b/glance/tests/unit/test_wsgi.py
@@ -134,6 +134,9 @@ def test_default(self):
         response = webob.Response()
         wsgi.JSONResponseSerializer().default(response, fixture)
         self.assertEqual(response.status_int, 200)
+        content_types = filter(lambda h: h[0] == 'Content-Type',
+                               response.headerlist)
+        self.assertEqual(len(content_types), 1)
         self.assertEqual(response.content_type, 'application/json')
         self.assertEqual(response.body, '{"key": "value"}')