iostream: resolve reads that may be completed while closing

fixes issue that a read may fail with StreamClosedError
if stream is closed mid-read

diff --git a/tornado/iostream.py b/tornado/iostream.py
index ee305922dc084b47e4368b0ef631eb6c2aec407b..37aeb94f23d926894e91dcbcd80a7381ebeb0372 100644 (file)
--- a/tornado/iostream.py
+++ b/tornado/iostream.py
@@ -609,6 +609,11 @@ class BaseIOStream(object):
             if self._read_until_close:
                 self._read_until_close = False
                 self._finish_read(self._read_buffer_size, False)
+            elif self._read_future is not None:
+                # resolve reads that are pending and ready to complete
+                pos = self._find_read_pos()
+                if pos is not None:
+                    self._read_from_buffer(pos)
             if self._state is not None:
                 self.io_loop.remove_handler(self.fileno())
                 self._state = None