Cleanup CORK flag on exceptions

Author: asvetlov

aiohttp/server.py

@@ -359,6 +359,8 @@ def handle_error(self, status=500, message=None,
             response.send_headers()
 
             response.write(html)
+            # disable CORK, enable NODELAY if needed
+            self.writer.set_tcp_nodelay(True)
             drain = response.write_eof()
 
             self.log_access(message, None, response, self._loop.time() - now)

aiohttp/web_reqrep.py

@@ -701,8 +701,6 @@ def _start(self, request):
             request.version,
             not keep_alive,
             self._reason)
-        resp_impl.transport.set_tcp_nodelay(self._tcp_nodelay)
-        resp_impl.transport.set_tcp_cork(self._tcp_cork)
 
         self._copy_cookies()
 
@@ -722,6 +720,8 @@ def _start(self, request):
         for key, val in headers:
             resp_impl.add_header(key, val)
 
+        resp_impl.transport.set_tcp_nodelay(self._tcp_nodelay)
+        resp_impl.transport.set_tcp_cork(self._tcp_cork)
         resp_impl.send_headers()
         return resp_impl
 
@@ -847,10 +847,12 @@ def text(self, text):
 
     @asyncio.coroutine
     def write_eof(self):
-        body = self._body
-        if body is not None:
-            self.write(body)
-        self.set_tcp_nodelay(True)
+        try:
+            body = self._body
+            if body is not None:
+                self.write(body)
+        finally:
+            self.set_tcp_nodelay(True)
         yield from super().write_eof()
 
 

aiohttp/web_urldispatcher.py

@@ -288,12 +288,14 @@ def handle(self, request):
 
         resp.content_length = file_size
         resp.set_tcp_cork(True)
-        yield from resp.prepare(request)
+        try:
+            yield from resp.prepare(request)
 
-        with open(filepath, 'rb') as f:
-            yield from self._sendfile(request, resp, f, file_size)
+            with open(filepath, 'rb') as f:
+                yield from self._sendfile(request, resp, f, file_size)
 
-        resp.set_tcp_nodelay(True)
+        finally:
+            resp.set_tcp_nodelay(True)
 
         return resp