Return the Etag header on 304 responses to an If-None-Match request.

diff --git a/tornado/web.py b/tornado/web.py
index d1a26f576e3d7885001cb67a26cf50b17aae687a..8b5d269010b74a50c9461208731192f49f5c3264 100644 (file)
--- a/tornado/web.py
+++ b/tornado/web.py
@@ -657,12 +657,11 @@ class RequestHandler(object):
                 "Etag" not in self._headers):
                 etag = self.compute_etag()
                 if etag is not None:
+                    self.set_header("Etag", etag)
                     inm = self.request.headers.get("If-None-Match")
                     if inm and inm.find(etag) != -1:
                         self._write_buffer = []
                         self.set_status(304)
-                    else:
-                        self.set_header("Etag", etag)
             if "Content-Length" not in self._headers:
                 content_length = sum(len(part) for part in self._write_buffer)
                 self.set_header("Content-Length", content_length)