Bail out correctly if socket.recv gets nothing (indicating a closed socket)

2013-08-19 09:59:47 -05:00 · 2013-08-19 09:59:47 -05:00 · e92df1dc76
commit e92df1dc76
parent 3d3b318a86
1 changed files with 4 additions and 1 deletions
--- a/utilities/fireball2
+++ b/utilities/fireball2
@ -163,7 +163,10 @@ class ThreadedTCPRequestHandler(SocketServer.BaseRequestHandler):
        data_len = struct.unpack('Q',data[:header_len])[0]
        data = data[header_len:]
        while len(data) < data_len:
-            data += self.request.recv(1024)
+            d = self.request.recv(1024)
+            if not d:
+                return None
+            data += d
        return data

    def handle(self):