Don't set content-length in StaticFileHandler unless we're actually

sending the content.  Some browsers get confused by this (e.g. the
version of webkit embedded in fluid, but not the version used in chrome).

diff --git a/tornado/web.py b/tornado/web.py
index c343cd0e3222bae11858d15177d94e7a881cd3da..403c25cb8c8aed3c244df4bbc842a6797e5a99e4 100644 (file)
--- a/tornado/web.py
+++ b/tornado/web.py
@@ -1110,7 +1110,6 @@ class StaticFileHandler(RequestHandler):
         modified = datetime.datetime.fromtimestamp(stat_result[stat.ST_MTIME])
 
         self.set_header("Last-Modified", modified)
-        self.set_header("Content-Length", stat_result[stat.ST_SIZE])
         if "v" in self.request.arguments:
             self.set_header("Expires", datetime.datetime.utcnow() + \
                                        datetime.timedelta(days=365*10))
@@ -1133,6 +1132,7 @@ class StaticFileHandler(RequestHandler):
 
         if not include_body:
             return
+        self.set_header("Content-Length", stat_result[stat.ST_SIZE])
         file = open(abspath, "r")
         try:
             self.write(file.read())