Merge lp:~notmyname/swift/manifest_headers into lp:~hudson-openstack/swift/trunk

[John Dickinson]

updated the proxy to return all headers stored for manifest objects

[gholt (gholt)]

review: Approve

[Greg Lange (greglange)]

review: Approve

=== modified file 'swift/proxy/server.py'
--- swift/proxy/server.py	2011-08-12 13:33:42 +0000
+++ swift/proxy/server.py	2011-08-22 15:24:04 +0000
@@ -819,13 +819,7 @@
                             yield obj
                         marker = sublisting[-1]['name']
 
-                headers = {
-                    'X-Object-Manifest': resp.headers['x-object-manifest'],
-                    'Content-Type': resp.content_type}
-                for key, value in resp.headers.iteritems():
-                    if key.lower().startswith('x-object-meta-'):
-                        headers[key] = value
-                resp = Response(headers=headers, request=req,
+                resp = Response(headers=resp.headers, request=req,
                                 conditional_response=True)
                 if req.method == 'HEAD':
                     # These shenanigans are because webob translates the HEAD
@@ -859,20 +853,13 @@
                     content_length = 0
                     last_modified = resp.last_modified
                     etag = md5().hexdigest()
-                headers = {
-                    'X-Object-Manifest': resp.headers['x-object-manifest'],
-                    'Content-Type': resp.content_type,
-                    'Content-Length': content_length,
-                    'ETag': etag}
-                for key, value in resp.headers.iteritems():
-                    if key.lower().startswith('x-object-meta-'):
-                        headers[key] = value
-                resp = Response(headers=headers, request=req,
+                resp = Response(headers=resp.headers, request=req,
                                 conditional_response=True)
                 resp.app_iter = SegmentedIterable(self, lcontainer, listing,
                                                   resp)
                 resp.content_length = content_length
                 resp.last_modified = last_modified
+                resp.etag = etag
             resp.headers['accept-ranges'] = 'bytes'
 
         return resp
 
=== modified file 'test/unit/proxy/test_server.py'
--- test/unit/proxy/test_server.py	2011-07-22 17:54:54 +0000
+++ test/unit/proxy/test_server.py	2011-08-22 15:24:04 +0000
@@ -71,7 +71,8 @@
     mkdirs(os.path.join(_testdir, 'sdb1', 'tmp'))
     _orig_container_listing_limit = proxy_server.CONTAINER_LISTING_LIMIT
     conf = {'devices': _testdir, 'swift_dir': _testdir,
-            'mount_check': 'false'}
+            'mount_check': 'false', 'allowed_headers':
+            'content-encoding, x-object-manifest, content-disposition, foo'}
     prolis = listen(('localhost', 0))
     acc1lis = listen(('localhost', 0))
     acc2lis = listen(('localhost', 0))
@@ -2437,7 +2438,8 @@
         fd.write('PUT /v1/a/segmented/name HTTP/1.1\r\nHost: '
             'localhost\r\nConnection: close\r\nX-Storage-Token: '
             't\r\nContent-Length: 0\r\nX-Object-Manifest: '
-            'segmented/name/\r\nContent-Type: text/jibberish\r\n\r\n')
+            'segmented/name/\r\nContent-Type: text/jibberish\r\n'
+            'Foo: barbaz\r\n\r\n')
         fd.flush()
         headers = readuntil2crlfs(fd)
         exp = 'HTTP/1.1 201'
@@ -2454,6 +2456,7 @@
         self.assertEquals(headers[:len(exp)], exp)
         self.assert_('X-Object-Manifest: segmented/name/' in headers)
         self.assert_('Content-Type: text/jibberish' in headers)
+        self.assert_('Foo: barbaz' in headers)
         body = fd.read()
         self.assertEquals(body, '1234 1234 1234 1234 1234 ')
         # Do it again but exceeding the container listing limit