commit 9c00bdd1ac6d8b1c119d0f8a7866d9d7e726aa38 parent 4dd81df7e771997d69a898d35ac3e3e1b3899ec1 Author: thomasv <thomasv@gitorious> Date: Tue, 6 Dec 2011 16:32:48 +0100 Merge branch 'master' of git://gitorious.org/electrum/electrum Diffstat:
M | server/server.py | | | 2 | ++ |
1 file changed, 2 insertions(+), 0 deletions(-)
diff --git 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