diff options
| author | Mark Sapiro <msapiro@value.net> | 2012-03-27 15:25:13 -0700 |
|---|---|---|
| committer | Mark Sapiro <msapiro@value.net> | 2012-03-27 15:25:13 -0700 |
| commit | f768fbc600a3293949d536e8189b720b5971e063 (patch) | |
| tree | 4181b3114b72114cc35ad2949aaee1d6c6ed862c | |
| parent | 8699637987a4632428f56e7eafa8aa3f4dcf2e30 (diff) | |
| download | mailman2-f768fbc600a3293949d536e8189b720b5971e063.tar.gz mailman2-f768fbc600a3293949d536e8189b720b5971e063.tar.xz mailman2-f768fbc600a3293949d536e8189b720b5971e063.zip | |
Fixed a possible CPU bound loop in OutgoingRunner if the attempt to
Connect to the SMTP server throws a socket.error. (LP: #966531)
| -rw-r--r-- | Mailman/Queue/OutgoingRunner.py | 3 | ||||
| -rw-r--r-- | NEWS | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Mailman/Queue/OutgoingRunner.py b/Mailman/Queue/OutgoingRunner.py index 0f51b663..defaf02d 100644 --- a/Mailman/Queue/OutgoingRunner.py +++ b/Mailman/Queue/OutgoingRunner.py @@ -1,4 +1,4 @@ -# Copyright (C) 2000-2007 by the Free Software Foundation, Inc. +# Copyright (C) 2000-2012 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -89,6 +89,7 @@ class OutgoingRunner(Runner, BounceMixin): syslog('error', 'Cannot connect to SMTP server %s on port %s', mm_cfg.SMTPHOST, port) self.__logged = True + self._snooze(0) return True except Errors.SomeRecipientsFailed, e: # Handle local rejects of probe messages differently. @@ -98,6 +98,9 @@ Here is a history of user visible changes to Mailman. Bug Fixes and other patches + - Fixed a possible CPU bound loop in OutgoingRunner if the attempt to + Connect to the SMTP server throws a socket.error. (LP: #966531) + - Fixed a potential crash in the web UI if a language is removed from the LC_DESCRIPTIONS dictionary. (LP: #966565) |