diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2012-06-27 16:24:34 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2012-06-27 16:24:34 +1200 |
| commit | 97071c0952d047c46d7feeb7907332f80ae0b734 (patch) | |
| tree | 4128e9ef1753388dc0e50c8000ecb682ce6c992e /netlib/tcp.py | |
| parent | 5d4c7829bfdda8c0a5fd28896fd925d63221b929 (diff) | |
| parent | d0fd8385e60ea6149d9ff6876fb5b4343187b23a (diff) | |
| download | mitmproxy-97071c0952d047c46d7feeb7907332f80ae0b734.tar.gz mitmproxy-97071c0952d047c46d7feeb7907332f80ae0b734.tar.bz2 mitmproxy-97071c0952d047c46d7feeb7907332f80ae0b734.zip | |
Merge branch 'master' of ssh.github.com:cortesi/netlib
Diffstat (limited to 'netlib/tcp.py')
| -rw-r--r-- | netlib/tcp.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/netlib/tcp.py b/netlib/tcp.py index 49c8b7a2..ef3298d5 100644 --- a/netlib/tcp.py +++ b/netlib/tcp.py @@ -17,7 +17,7 @@ class FileLike: def read(self, length): result = '' - while len(result) < length: + while length > 0: try: data = self.o.read(length) except (SSL.ZeroReturnError, SSL.SysCallError): @@ -25,6 +25,7 @@ class FileLike: if not data: break result += data + length -= len(data) return result def write(self, v): |