Handle 1xx's along 204/304's

diff --git a/tornado/web.py b/tornado/web.py
index 338fe0f050beeebdf1941c2b547d00c8737d7b54..e8d102b50e9880ff665591faba0a9887d19e3630 100644 (file)
--- a/tornado/web.py
+++ b/tornado/web.py
@@ -974,11 +974,11 @@ class RequestHandler(object):
                 if self.check_etag_header():
                     self._write_buffer = []
                     self.set_status(304)
-            if self._status_code in (204, 304):
+            if (self._status_code in (204, 304) or
+                (self._status_code >= 100 and self._status_code < 200)):
                 assert not self._write_buffer, "Cannot send body with %s" % self._status_code
                 self._clear_headers_for_304()
-            elif ("Content-Length" not in self._headers and
-                  (self._status_code < 100 or self._status_code >= 200)):
+            elif "Content-Length" not in self._headers:
                 content_length = sum(len(part) for part in self._write_buffer)
                 self.set_header("Content-Length", content_length)