aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Mailman/Defaults.py.in7
-rw-r--r--NEWS3
2 files changed, 8 insertions, 2 deletions
diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in
index a10e2976..73bc8a47 100644
--- a/Mailman/Defaults.py.in
+++ b/Mailman/Defaults.py.in
@@ -663,8 +663,11 @@ VERP_CONFIRM_FORMAT = '%(addr)s+%(cookie)s'
# 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>[^@]+)@.*$'
+# or even
+# To: "local_part@host" <local_part@host>
+# and may even fold the header when replying, so we skip everything up to '<'
+# if any and include ($s) so dot will match the newline in a folded header.
+VERP_CONFIRM_REGEXP = r'(?s)^(.*<)?(?P<addr>.+)\+(?P<cookie>[^@+]+)@.*$'
# Set this to Yes to enable VERP-like (more user friendly) confirmations
VERP_CONFIRMATIONS = No
diff --git a/NEWS b/NEWS
index b4ada2c8..cc3f2e48 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,9 @@ Here is a history of user visible changes to Mailman.
Bug Fixes and other patches
+ - Changed VERP_CONFIRM_REGEXP in Defaults.py to work if the replying
+ MUA folds the To: header and in cases where the list name includes '+'.
+
- Fixed some paths in contrib/check_perms_grsecurity.py. Bug #411192.
- Replies to commands sent to list-request now come From: list-owner