Fix #1177: static file handling doesn't raise assertion anymore

aio-libs · Sep 16, 2016 · a727cca · a727cca
1 parent ca6465e
commit a727cca
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -12,6 +12,8 @@ CHANGES
 - Use `text/html` content type for displaying index pages by static
   file handler.
 
+- Fix `AssertionError` in static file handling #1177
+
 
 1.0.0 (09-16-2016)
 -------------------

diff --git a/aiohttp/file_sender.py b/aiohttp/file_sender.py
@@ -65,8 +65,21 @@ def _send_headers(resp_impl):
             pass
 
         resp._send_headers = _send_headers
+
+        @asyncio.coroutine
+        def write_eof():
+            # Durty hack required for
+            # https://github.com/KeepSafe/aiohttp/issues/1177
+            # do nothing in write_eof
+            pass
+
+        resp.write_eof = write_eof
+
         yield from resp.prepare(request)
 
+        # TODO: %O and %b (resp_impl.output_length and resp_impl.output)
+        # access log formats are broken
+
         loop = request.app.loop
         # See https://github.com/KeepSafe/aiohttp/issues/958 for details