1.1 --- a/mailman/mailman.patch Tue Aug 28 19:02:00 2012 +0200
1.2 +++ b/mailman/mailman.patch Tue Aug 28 19:02:05 2012 +0200
1.3 @@ -73,7 +73,7 @@
1.4 Index: Mailman/Handlers/Scrubber.py
1.5 --- Mailman/Handlers/Scrubber.py.orig 2009-02-23 22:23:35 +0100
1.6 +++ Mailman/Handlers/Scrubber.py 2009-03-27 11:55:18 +0100
1.7 -@@ -368,6 +368,8 @@
1.8 +@@ -371,6 +371,8 @@
1.9 t = unicode(t, 'ascii', 'replace')
1.10 try:
1.11 # Should use HTML-Escape, or try generalizing to UTF-8
1.12 @@ -82,23 +82,12 @@
1.13 t = t.encode(charset, 'replace')
1.14 except (UnicodeError, LookupError, ValueError,
1.15 AssertionError):
1.16 -Index: Mailman/Queue/OutgoingRunner.py
1.17 ---- Mailman/Queue/OutgoingRunner.py.orig 2009-02-23 22:23:35 +0100
1.18 -+++ Mailman/Queue/OutgoingRunner.py 2009-03-27 11:55:18 +0100
1.19 -@@ -89,6 +89,7 @@
1.20 - syslog('error', 'Cannot connect to SMTP server %s on port %s',
1.21 - mm_cfg.SMTPHOST, port)
1.22 - self.__logged = True
1.23 -+ self._snooze(0)
1.24 - return True
1.25 - except Errors.SomeRecipientsFailed, e:
1.26 - # Handle local rejects of probe messages differently.
1.27 Index: Mailman/htmlformat.py
1.28 --- Mailman/htmlformat.py.orig 2009-02-23 22:23:35 +0100
1.29 +++ Mailman/htmlformat.py 2009-03-27 11:55:18 +0100
1.30 -@@ -300,7 +300,8 @@
1.31 +@@ -302,7 +302,8 @@
1.32 charset = 'us-ascii'
1.33 - if self.language:
1.34 + if self.language and Utils.IsLanguage(self.language):
1.35 charset = Utils.GetCharSet(self.language)
1.36 - output = ['Content-Type: text/html; charset=%s\n' % charset]
1.37 + output = ['Content-Type: text/html; charset=%s' % charset]
