update

Author: jaredmauch

Mailman/Archiver/Archiver.py

@@ -194,8 +194,9 @@ def ArchiveMail(self, msg):
         # itself must be locked.
         if mm_cfg.ARCHIVE_TO_MBOX in (1, 2):
             try:
-                with self.__archive_file(self.ArchiveFileName()) as mbox:
-                    mbox.AppendMessage(msg)
+                mbox = self.__archive_file(self.ArchiveFileName())
+                mbox.AppendMessage(msg)
+                mbox.fp.close()
             except IOError as msg:
                 syslog('error', 'Archive file access failure:\n\t%s %s', 
                        self.ArchiveFileName(), msg)

Mailman/Handlers/SMTPDirect.py

@@ -206,7 +206,7 @@ def process(mlist, msg, msgdata):
         return
 
     # Chunkify the recipients
-    chunks = chunkify(recips, mm_cfg.SMTP_MAX_RCPTS_PER_CHUNK)
+    chunks = chunkify(recips, mm_cfg.SMTP_MAX_RCPTS)
     # Choose the delivery function based on VERP settings
     if msgdata.get('verp'):
         deliveryfunc = verpdeliver