From ab93e70f12da510902dffa7a393f5173c2073d6e Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Thu, 3 Sep 2009 10:29:36 -0700 Subject: 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 '+'. --- Mailman/Defaults.py.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Mailman') 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" -# when replying, so we skip everything up to '<' if any. -VERP_CONFIRM_REGEXP = r'^(.*<)?(?P[^+]+?)\+(?P[^@]+)@.*$' +# or even +# To: "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.+)\+(?P[^@+]+)@.*$' # Set this to Yes to enable VERP-like (more user friendly) confirmations VERP_CONFIRMATIONS = No -- cgit v1.2.3