From: Ben Darnell <ben@bendarnell.com>
Date: Wed, 6 Mar 2013 02:53:40 +0000 (-0500)
Subject: Use _try_inline_read instead of _read_from_buffer in read_until_close.
X-Git-Tag: v3.0.0~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73c0aee4a5898ef3fb7d67e753ae8d47e400b570;p=thirdparty%2Ftornado.git

Use _try_inline_read instead of _read_from_buffer in read_until_close.

Closes #686.
---

diff --git a/tornado/iostream.py b/tornado/iostream.py
index 28bc18f4a..bcb0eb46e 100644
--- a/tornado/iostream.py
+++ b/tornado/iostream.py
@@ -174,8 +174,7 @@ class BaseIOStream(object):
             return
         self._read_until_close = True
         self._streaming_callback = stack_context.wrap(streaming_callback)
-        self._read_from_buffer()
-        self._add_io_state(self.io_loop.READ)
+        self._try_inline_read()
 
     def write(self, data, callback=None):
         """Write the given data to this stream.