bug [ 1296004 ] MemoryError in httplib
diff --git a/Lib/httplib.py b/Lib/httplib.py
index e017cdf..5c82edd 100644
--- a/Lib/httplib.py
+++ b/Lib/httplib.py
@@ -153,6 +153,9 @@
INSUFFICIENT_STORAGE = 507
NOT_EXTENDED = 510
+# maximal amount of data to read at one time in _safe_read
+MAXAMOUNT = 1048576
+
class HTTPMessage(mimetools.Message):
def addheader(self, key, value):
@@ -541,14 +544,14 @@
reading. If the bytes are truly not available (due to EOF), then the
IncompleteRead exception can be used to detect the problem.
"""
- s = ''
+ s = []
while amt > 0:
- chunk = self.fp.read(amt)
+ chunk = self.fp.read(min(amt, MAXAMOUNT))
if not chunk:
raise IncompleteRead(s)
- s += chunk
+ s.append(chunk)
amt -= len(chunk)
- return s
+ return ''.join(s)
def getheader(self, name, default=None):
if self.msg is None: