diff options
| author | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2016-07-12 10:09:09 +0900 |
|---|---|---|
| committer | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2016-07-12 10:09:09 +0900 |
| commit | cf3173589c879179e0f4c5eb9763f415d14b3d8f (patch) | |
| tree | 069a4103f559dec875eceb657b77bf62b438161b | |
| parent | 79b979f4a01475359abcf6ca23d507b99b387e54 (diff) | |
| parent | ba66ce7f13827b858125131fa638c87266d9cf99 (diff) | |
| download | mailman2-cf3173589c879179e0f4c5eb9763f415d14b3d8f.tar.gz mailman2-cf3173589c879179e0f4c5eb9763f415d14b3d8f.tar.xz mailman2-cf3173589c879179e0f4c5eb9763f415d14b3d8f.zip | |
Merge lp:mailman/2.1 rev 1660
| -rw-r--r-- | Mailman/Handlers/SpamDetect.py | 2 | ||||
| -rw-r--r-- | NEWS | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Mailman/Handlers/SpamDetect.py b/Mailman/Handlers/SpamDetect.py index c7b8d9e7..1ea295a6 100644 --- a/Mailman/Handlers/SpamDetect.py +++ b/Mailman/Handlers/SpamDetect.py @@ -86,7 +86,7 @@ def getDecodedHeaders(msg, cset='utf-8'): # unicode it as iso-8859-1 which may result in a garbled # mess, but we have to do something. uvalue += unicode(frag, 'iso-8859-1', 'replace') - headers += '%s: %s\n' % (h, uvalue.encode(cset, 'replace')) + headers += '%s: %s\n' % (h, uvalue.encode(cset, 'backslashreplace')) return headers @@ -9,6 +9,14 @@ Here is a history of user visible changes to Mailman. New Features + - RFC 2047 encoded headers are now decoded and re-encoded in the charset of + the list's preferred language for matching by header_filter_rules using + errors='backslashreplace' instead of the former errors='replace'. This + means that characters that can't be represented in the charset of the + list's preferred language will now be represented as '\uxxxx' escapes + rather than '?' enabling regexps to be constructed to match specific + characters or ranges. (LP: #558155) + - Thanks to Jim Popovitch REMOVE_DKIM_HEADERS can now be set to 3 to preserve the original headers as X-Mailman-Original-... before removing them. |