Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Lib/imaplib.py
Original file line number Diff line number Diff line change
Expand Up @@ -1280,6 +1280,10 @@ def _get_response(self, start_timeout=False):

dat = self._get_line()

# Skip a blank line that some servers send after a literal.
if dat == b'':
dat = self._get_line()

self._append_untagged(typ, dat)

# Bracketed response information?
Expand Down
17 changes: 17 additions & 0 deletions Lib/test/test_imaplib.py
Original file line number Diff line number Diff line change
Expand Up @@ -655,6 +655,23 @@ def cmd_LSUB(self, tag, args):
self.assertEqual(typ, 'OK')
self.assertEqual(data[0], b'() "." directoryA')

def test_extra_blank_line_after_literal(self):
# Some buggy servers send an extra blank line after the counted
# literal data. imaplib should skip it instead of failing.
class BlankLineHandler(SimpleIMAPHandler):
def cmd_FETCH(self, tag, args):
self._send(b'* 1 FETCH (BODY[HEADER] {13}\r\n')
self._send(b'Subject: test') # 13-byte literal
self._send(b'\r\n)\r\n') # stray blank line, then ')'
self._send_tagged(tag, 'OK', 'FETCH completed')
client, _ = self._setup(BlankLineHandler)
client.login('user', 'pass')
client.select()
typ, data = client.fetch('1', '(BODY[HEADER])')
self.assertEqual(typ, 'OK')
self.assertEqual(data, [(b'1 (BODY[HEADER] {13}', b'Subject: test'),
b')'])

def test_unselect(self):
client, _ = self._setup(SimpleIMAPHandler)
client.login('user', 'pass')
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
:mod:`imaplib` no longer fails when a server sends a spurious blank line
after the counted data of a literal. Such a blank line is now skipped.
Loading