Merge "Fixed bug where 204 would sometimes be chunked" into milestone-proposed

Author: Jenkins

swift/proxy/server.py

@@ -839,11 +839,10 @@ def GETorHEAD_base(self, req, server_type, partition, nodes, path,
                 res.environ['swift_x_timestamp'] = \
                     source.getheader('x-timestamp')
                 update_headers(res, {'accept-ranges': 'bytes'})
-                if req.method == 'HEAD':
-                    res.content_length = source.getheader('Content-Length')
-                    if source.getheader('Content-Type'):
-                        res.charset = None
-                        res.content_type = source.getheader('Content-Type')
+                res.content_length = source.getheader('Content-Length')
+                if source.getheader('Content-Type'):
+                    res.charset = None
+                    res.content_type = source.getheader('Content-Type')
                 return res
         return self.best_response(req, statuses, reasons, bodies,
                                   '%s %s' % (server_type, req.method))

test/unit/proxy/test_server.py

@@ -3492,6 +3492,18 @@ def clean_acl(header, value):
             res = controller.PUT(req)
         self.assert_(called[0])
 
+    def test_GET_no_content(self):
+        with save_globals():
+            proxy_server.http_connect = \
+                fake_http_connect(200, 204, 204, 204)
+            controller = proxy_server.ContainerController(self.app, 'account',
+                                                          'container')
+            req = Request.blank('/a/c')
+            self.app.update_request(req)
+            res = controller.GET(req)
+            self.assertEquals(res.content_length, 0)
+            self.assertTrue('transfer-encoding' not in res.headers)
+
     def test_GET_calls_authorize(self):
         called = [False]