Merge "Don't set the already set Connection: close"

swift/proxy/controllers/obj.py

@@ -279,9 +279,6 @@ class ObjectController(Controller):
         headers = [self.generate_request_headers(req, additional=req.headers)
                    for _junk in range(n_outgoing)]
 
-        for header in headers:
-            header['Connection'] = 'close'
-
         for i, container in enumerate(containers):
             i = i % len(headers)
 

test/unit/proxy/controllers/test_base.py

@@ -618,7 +618,8 @@ class TestFuncs(unittest.TestCase):
         req = Request.blank('/v1/a/c/o', headers=src_headers)
         dst_headers = base.generate_request_headers(req, transfer=True)
         expected_headers = {'x-base-meta-owner': '',
-                            'x-base-meta-size': '151M'}
+                            'x-base-meta-size': '151M',
+                            'connection': 'close'}
         for k, v in expected_headers.iteritems():
             self.assertTrue(k in dst_headers)
             self.assertEqual(v, dst_headers[k])