comparison: mailman/mailman.patch
mailman/mailman.patch
- changeset 784
- 8a194ef19c9c
- parent 371
- 3d7d8c68b2fc
equal
deleted
inserted
replaced
| 1:b41718ee1e61 | 2:2c8de0c93343 |
|---|---|
| 71 | 71 |
| 72 | 72 |
| 73 Index: Mailman/Handlers/Scrubber.py | 73 Index: Mailman/Handlers/Scrubber.py |
| 74 --- Mailman/Handlers/Scrubber.py.orig 2009-02-23 22:23:35 +0100 | 74 --- Mailman/Handlers/Scrubber.py.orig 2009-02-23 22:23:35 +0100 |
| 75 +++ Mailman/Handlers/Scrubber.py 2009-03-27 11:55:18 +0100 | 75 +++ Mailman/Handlers/Scrubber.py 2009-03-27 11:55:18 +0100 |
| 76 @@ -368,6 +368,8 @@ | 76 @@ -371,6 +371,8 @@ |
| 77 t = unicode(t, 'ascii', 'replace') | 77 t = unicode(t, 'ascii', 'replace') |
| 78 try: | 78 try: |
| 79 # Should use HTML-Escape, or try generalizing to UTF-8 | 79 # Should use HTML-Escape, or try generalizing to UTF-8 |
| 80 + if len(charset) == 0: | 80 + if len(charset) == 0: |
| 81 + charset = 'us-ascii' | 81 + charset = 'us-ascii' |
| 82 t = t.encode(charset, 'replace') | 82 t = t.encode(charset, 'replace') |
| 83 except (UnicodeError, LookupError, ValueError, | 83 except (UnicodeError, LookupError, ValueError, |
| 84 AssertionError): | 84 AssertionError): |
| 85 Index: Mailman/Queue/OutgoingRunner.py | |
| 86 --- Mailman/Queue/OutgoingRunner.py.orig 2009-02-23 22:23:35 +0100 | |
| 87 +++ Mailman/Queue/OutgoingRunner.py 2009-03-27 11:55:18 +0100 | |
| 88 @@ -89,6 +89,7 @@ | |
| 89 syslog('error', 'Cannot connect to SMTP server %s on port %s', | |
| 90 mm_cfg.SMTPHOST, port) | |
| 91 self.__logged = True | |
| 92 + self._snooze(0) | |
| 93 return True | |
| 94 except Errors.SomeRecipientsFailed, e: | |
| 95 # Handle local rejects of probe messages differently. | |
| 96 Index: Mailman/htmlformat.py | 85 Index: Mailman/htmlformat.py |
| 97 --- Mailman/htmlformat.py.orig 2009-02-23 22:23:35 +0100 | 86 --- Mailman/htmlformat.py.orig 2009-02-23 22:23:35 +0100 |
| 98 +++ Mailman/htmlformat.py 2009-03-27 11:55:18 +0100 | 87 +++ Mailman/htmlformat.py 2009-03-27 11:55:18 +0100 |
| 99 @@ -300,7 +300,8 @@ | 88 @@ -302,7 +302,8 @@ |
| 100 charset = 'us-ascii' | 89 charset = 'us-ascii' |
| 101 if self.language: | 90 if self.language and Utils.IsLanguage(self.language): |
| 102 charset = Utils.GetCharSet(self.language) | 91 charset = Utils.GetCharSet(self.language) |
| 103 - output = ['Content-Type: text/html; charset=%s\n' % charset] | 92 - output = ['Content-Type: text/html; charset=%s\n' % charset] |
| 104 + output = ['Content-Type: text/html; charset=%s' % charset] | 93 + output = ['Content-Type: text/html; charset=%s' % charset] |
| 105 + output.append('Cache-control: no-cache\n') | 94 + output.append('Cache-control: no-cache\n') |
| 106 if not self.suppress_head: | 95 if not self.suppress_head: |
