Merge lp:~notmyname/swift/allowed_headers_head_backport into lp:~swift/swift/omega-1.3.0-4

[John Dickinson]

fixed allowed_headers to work with both HEAD and GET

[gholt (gholt)]

I merged this into https://code.launchpad.net/~swift/swift/omega-1.3.0-5

review: Approve

=== modified file 'swift/obj/server.py'
--- swift/obj/server.py	2011-04-12 00:24:35 +0000
+++ swift/obj/server.py	2011-04-19 21:16:29 +0000
@@ -649,8 +649,8 @@
         response = Response(content_type=file.metadata['Content-Type'],
                             request=request, conditional_response=True)
         for key, value in file.metadata.iteritems():
-            if key == 'X-Object-Manifest' or \
-                    key.lower().startswith('x-object-meta-'):
+            if key.lower().startswith('x-object-meta-') or \
+                    key.lower() in self.allowed_headers:
                 response.headers[key] = value
         response.etag = file.metadata['ETag']
         response.last_modified = float(file.metadata['X-Timestamp'])

=== modified file 'test/unit/obj/test_server.py'
--- test/unit/obj/test_server.py	2011-03-29 20:32:27 +0000
+++ test/unit/obj/test_server.py	2011-04-19 21:16:29 +0000
@@ -343,6 +343,19 @@
                      "Content-Encoding" in resp.headers)
         self.assertEquals(resp.headers['Content-Type'], 'application/x-test')
 
+        req = Request.blank('/sda1/p/a/c/o',
+                            environ={'REQUEST_METHOD': 'HEAD'})
+        resp = self.object_controller.HEAD(req)
+        self.assert_("X-Object-Meta-1" not in resp.headers and
+                     "X-Object-Meta-Two" not in resp.headers and
+                     "X-Object-Meta-3" in resp.headers and
+                     "X-Object-Meta-4" in resp.headers and
+                     "Foo" in resp.headers and
+                     "Bar" in resp.headers and
+                     "Baz" not in resp.headers and
+                     "Content-Encoding" in resp.headers)
+        self.assertEquals(resp.headers['Content-Type'], 'application/x-test')
+
         timestamp = normalize_timestamp(time())
         req = Request.blank('/sda1/p/a/c/o',
                             environ={'REQUEST_METHOD': 'POST'},