changeset:   95134:be6c4569f845
parent:      95131:643471ed8415
parent:      95133:c1348ada8fc6
user:        R David Murray <rdmurray@bitdance.com>
date:        Sun Mar 22 16:18:59 2015 -0400
files:       Lib/imaplib.py Misc/NEWS
description:
Merge: #23647: Increase imaplib's MAXLINE to accommodate modern mailbox sizes.


diff -r 643471ed8415 -r be6c4569f845 Lib/imaplib.py
--- a/Lib/imaplib.py	Sun Mar 22 15:19:01 2015 -0400
+++ b/Lib/imaplib.py	Sun Mar 22 16:18:59 2015 -0400
@@ -45,11 +45,12 @@
 
 # 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
diff -r 643471ed8415 -r be6c4569f845 Misc/NEWS
--- a/Misc/NEWS	Sun Mar 22 15:19:01 2015 -0400
+++ b/Misc/NEWS	Sun Mar 22 16:18:59 2015 -0400
@@ -23,6 +23,8 @@
 Library
 -------
 
+- Issue #23647: Increase impalib's MAXLINE to accommodate modern mailbox sizes.
+
 - Issue #23539: If body is None, http.client.HTTPConnection.request now sets
   Content-Length to 0 for PUT, POST, and PATCH headers to avoid 411 errors from
   some web servers.