aio-libs · es1024 · Jul 28, 2017 · Jul 30, 2017 · asvetlov · Jul 30, 2017
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
@@ -61,6 +61,7 @@ Eduard Iskandarov
 Eli Ribble
 Elizabeth Leddy
 Enrique Saez
+Eric Sheng
 Erich Healy
 Eugene Chernyshov
 Eugene Naydenov

diff --git a/aiohttp/.web_response.py.swo b/aiohttp/.web_response.py.swo
diff --git a/aiohttp/web_fileresponse.py b/aiohttp/web_fileresponse.py
@@ -179,6 +179,7 @@ def prepare(self, request):
         modsince = request.if_modified_since
         if modsince is not None and st.st_mtime <= modsince.timestamp():
             self.set_status(HTTPNotModified.status_code)
+            self._length_check = False
             return (yield from super().prepare(request))
 
         ct, encoding = mimetypes.guess_type(str(filepath))

diff --git a/changes/2143.bugfix b/changes/2143.bugfix
@@ -0,0 +1 @@
+Fix FileResponse sending empty chunked body on 304.
diff --git a/tests/.test_web_sendfile_functional.py.swo b/tests/.test_web_sendfile_functional.py.swo
diff --git a/tests/test_web_sendfile_functional.py b/tests/test_web_sendfile_functional.py
@@ -165,7 +165,10 @@ def handler(request):
     resp.close()
 
     resp = yield from client.get('/', headers={'If-Modified-Since': lastmod})
+    body = yield from resp.read()
     assert 304 == resp.status
+    assert resp.headers.get('Content-Length') is None
+    assert b'' == body
     resp.close()
 
 
@@ -225,7 +228,10 @@ def handler(request):
     lastmod = 'Fri, 31 Dec 9999 23:59:59 GMT'
 
     resp = yield from client.get('/', headers={'If-Modified-Since': lastmod})
+    body = yield from resp.read()
     assert 304 == resp.status
+    assert resp.headers.get('Content-Length') is None
+    assert b'' == body
     resp.close()
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix FileResponse sending empty chunked body on 304.