Limit reads to block length.

1 files changed, 6 insertions, 2 deletions

diff --git a/netlib/tcp.py b/netlib/tcp.py
index 414c1237..f8f877de 100644
--- a/netlib/tcp.py
+++ b/netlib/tcp.py
@@ -106,13 +106,17 @@ class Writer(_FileLike):
 class Reader(_FileLike):
     def read(self, length):
         """
-            If length is None, we read until connection closes.
+            If length is -1, we read until connection closes.
         """
         result = ''
         start = time.time()
         while length == -1 or length > 0:
+            if length == -1 or length > self.BLOCKSIZE:
+                rlen = self.BLOCKSIZE
+            else:
+                rlen = length
             try:
-                data = self.o.read(self.BLOCKSIZE if length == -1 else length)
+                data = self.o.read(rlen)
             except SSL.ZeroReturnError:
                 break
             except SSL.WantReadError: