summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2015-03-22 16:18:59 -0400
committerR David Murray <rdmurray@bitdance.com>2015-03-22 16:18:59 -0400
commit94a64489568918ff51a80e748e78b9de836813ef (patch)
tree267986d72f02dbff0064730ddf6933d60e9da13e /Lib/imaplib.py
parentMerge: #23539: Set Content-Length to 0 for PUT, POST, and PATCH if body is None. (diff)
parent#23647: Increase imaplib's MAXLINE to accommodate modern mailbox sizes. (diff)
downloadcpython-94a64489568918ff51a80e748e78b9de836813ef.tar.gz
cpython-94a64489568918ff51a80e748e78b9de836813ef.tar.bz2
cpython-94a64489568918ff51a80e748e78b9de836813ef.zip
Merge: #23647: Increase imaplib's MAXLINE to accommodate modern mailbox sizes.
Diffstat (limited to 'Lib/imaplib.py')
-rw-r--r--Lib/imaplib.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/Lib/imaplib.py b/Lib/imaplib.py
index 49ee39def13..a218ab0716e 100644
--- a/Lib/imaplib.py
+++ b/Lib/imaplib.py
@@ -45,11 +45,12 @@ AllowedVersions = ('IMAP4REV1', 'IMAP4') # Most recent first
# Maximal line length when calling readline(). This is to prevent
# reading arbitrary length lines. RFC 3501 and 2060 (IMAP 4rev1)
-# don't specify a line length. RFC 2683 however suggests limiting client
-# command lines to 1000 octets and server command lines to 8000 octets.
-# We have selected 10000 for some extra margin and since that is supposedly
-# also what UW and Panda IMAP does.
-_MAXLINE = 10000
+# don't specify a line length. RFC 2683 suggests limiting client
+# command lines to 1000 octets and that servers should be prepared
+# to accept command lines up to 8000 octets, so we used to use 10K here.
+# In the modern world (eg: gmail) the response to, for example, a
+# search command can be quite large, so we now use 1M.
+_MAXLINE = 1000000
# Commands