Fix readline implementations so size argument is checked

earlier.
(transplanted from f1cc536d3f42ce695e4401ad729eec1985803579)

1 files changed, 3 insertions, 3 deletions

diff --git a/flup/server/ajp_base.py b/flup/server/ajp_base.py
index 74dddde..b9dfa0f 100644
--- a/flup/server/ajp_base.py
+++ b/flup/server/ajp_base.py
@@ -398,15 +398,15 @@ class InputStream(object):
                     newPos = self._avail
                     break
                 else:
+                    if length is not None and len(self._buf) >= length + self._pos:
+                        newPos = self._pos + length
+                        break
                     # Wait for more to come.
                     self._waitForData()
                     continue
             else:
                 newPos = i + 1
                 break
-        if length is not None:
-            if self._pos + length < newPos:
-                newPos = self._pos + length
         r = self._buf[self._pos:newPos]
         self._pos = newPos
         self._shrinkBuffer()