Merge branch 'master' into next

Conflicts: Changelog.draft.rst offlineimap/imapserver.py
2011-03-07 21:55:43 +01:00
parent 7a2a02254e b94bf79258
commit 7b8d7501d1
3 changed files with 11 additions and 1 deletions
--- a/offlineimap/imapserver.py
+++ b/offlineimap/imapserver.py
@ -70,6 +70,8 @@ class UsefulIMAP4(UsefulIMAPMixIn, imaplibutil.WrappedIMAP4):
            io = StringIO()
            while read < size:
                data = imaplib.IMAP4.read (self, min(size-read, 65536))
+                if not data:
+                    break
                read += len(data)
                io.write(data)
            return io.getvalue()