From f768fbc600a3293949d536e8189b720b5971e063 Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Tue, 27 Mar 2012 15:25:13 -0700 Subject: Fixed a possible CPU bound loop in OutgoingRunner if the attempt to Connect to the SMTP server throws a socket.error. (LP: #966531) --- Mailman/Queue/OutgoingRunner.py | 3 ++- NEWS | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) 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. diff --git a/NEWS b/NEWS index ebf2f9ce..e4dcc5bb 100644 --- a/NEWS +++ b/NEWS @@ -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) -- cgit v1.2.3