[Bug #792570] Under Windows, socket.read() seems to run into trouble when

asked to read tens of megabytes of data.  On my Mac, it hits MemoryErrors
when reading around 15Mb in one chunk.  The fix is to read the body in several
parts, not as one big piece.

It would be nice to fix the underlying socket.read() problem, too.

2.4 bugfix candidate.
This commit is contained in:
Andrew M. Kuchling 2005-12-04 15:36:57 +00:00
parent 3a97605500
commit e63fde72f3
2 changed files with 16 additions and 2 deletions

View file

@ -422,8 +422,19 @@ class SimpleXMLRPCRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
"""
try:
# get arguments
data = self.rfile.read(int(self.headers["content-length"]))
# Get arguments by reading body of request.
# We read this in chunks to avoid straining
# socket.read(); around the 10 or 15Mb mark, some platforms
# begin to have problems (bug #792570).
max_chunk_size = 10*1024*1024
size_remaining = int(self.headers["content-length"])
L = []
while size_remaining:
chunk_size = min(size_remaining, max_chunk_size)
L.append(self.rfile.read(chunk_size))
size_remaining -= len(L[-1])
data = ''.join(L)
# In previous versions of SimpleXMLRPCServer, _dispatch
# could be overridden in this class, instead of in
# SimpleXMLRPCDispatcher. To maintain backwards compatibility,