Merge pull request #567 from kjkuan/fix-chunked-encoding-with-empty-body

Fix the problem with chunked encoding with an empty body.
2014-12-25 12:21:06 -06:00
parent 3b655c4b71 39af574e7f
commit 1a85953325
1 changed files with 5 additions and 4 deletions
@@ -1850,13 +1850,14 @@ class WSGIWorker(Worker):
                if data:
                    self.write(data, sections)

-            if self.chunked:
-                # If chunked, send our final chunk length
-                self.conn.sendall(b('0\r\n\r\n'))
-            elif not self.headers_sent:
+            if not self.headers_sent:
                # Send headers if the body was empty
                self.send_headers('', sections)

+            if self.chunked and self.request_method != 'HEAD':
+                # If chunked, send our final chunk length
+                self.conn.sendall(b('0\r\n\r\n'))
+
        # Don't capture exceptions here.  The Worker class handles
        # them appropriately.
        finally: