aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormsapiro <>2006-03-18 17:27:56 +0000
committermsapiro <>2006-03-18 17:27:56 +0000
commita0c61812dd9a9f43813a004dc99b7dfe58abc797 (patch)
treedbbfa52f2384684c669d742a43b4e9f5da4be749
parentd249751089e06abcf9e233f2643451f9bfe1571e (diff)
downloadmailman2-a0c61812dd9a9f43813a004dc99b7dfe58abc797.tar.gz
mailman2-a0c61812dd9a9f43813a004dc99b7dfe58abc797.tar.xz
mailman2-a0c61812dd9a9f43813a004dc99b7dfe58abc797.zip
Fixed VERP_CONFIRM_REGEXP to accommodate 'broken' MUAs that add the
local_part of the From: address as a 'real name' in the To: header when replying.
-rw-r--r--Mailman/Defaults.py.in8
1 files changed, 6 insertions, 2 deletions
diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in
index e5dc7d82..d2e67f79 100644
--- a/Mailman/Defaults.py.in
+++ b/Mailman/Defaults.py.in
@@ -642,8 +642,12 @@ VERP_DELIVERY_INTERVAL = 0
VERP_CONFIRM_FORMAT = '%(addr)s+%(cookie)s'
# This is analogous to VERP_REGEXP, but for splitting apart the
-# VERP_CONFIRM_FORMAT.
-VERP_CONFIRM_REGEXP = r'^(?P<addr>[^+]+?)\+(?P<cookie>[^@]+)@.*$'
+# VERP_CONFIRM_FORMAT. MUAs have been observed that mung
+# From: local_part@host
+# into
+# To: "local_part" <local_part@host>
+# when replying, so we skip everything up to '<' if any.
+VERP_CONFIRM_REGEXP = r'^(.*<)?(?P<addr>[^+]+?)\+(?P<cookie>[^@]+)@.*$'
# Set this to Yes to enable VERP-like (more user friendly) confirmations
VERP_CONFIRMATIONS = No