Merge branch 'master' of git://gitorious.org/electrum/electrum

2011-12-06 16:32:48 +01:00 · 2011-12-06 16:32:48 +01:00 · 9c00bdd1ac
parent 4dd81df7e7 000d5f5c31
commit 9c00bdd1ac
1 changed files with 2 additions and 0 deletions
--- a/server/server.py
+++ b/server/server.py
@ -345,6 +345,8 @@ def client_thread(ipaddr,conn):
        while 1:
            d = conn.recv(1024)
            msg += d
+            if not d: 
+                break
            if d[-1]=='#':
                break