merge 2.7.7 release branch
diff --git a/Doc/howto/sockets.rst b/Doc/howto/sockets.rst
index e0083ed..0a7fcf5 100644
--- a/Doc/howto/sockets.rst
+++ b/Doc/howto/sockets.rst
@@ -207,13 +207,15 @@
totalsent = totalsent + sent
def myreceive(self):
- msg = ''
- while len(msg) < MSGLEN:
- chunk = self.sock.recv(MSGLEN-len(msg))
+ chunks = []
+ bytes_recd = 0
+ while bytes_recd < MSGLEN:
+ chunk = self.sock.recv(min(MSGLEN - bytes_recd, 2048))
if chunk == '':
raise RuntimeError("socket connection broken")
- msg = msg + chunk
- return msg
+ chucks.append(chunk)
+ bytes_recd = bytes_recd + len(chunk)
+ return ''.join(chunks)
The sending code here is usable for almost any messaging scheme - in Python you
send strings, and you can use ``len()`` to determine its length (even if it has