------------------------------------------------------------
revno: 1363
committer: Mark Sapiro <m...@msapiro.net>
branch nick: 2.2
timestamp: Sun 2014-12-07 20:53:04 -0800
message:
Accept email command in Subject: prefixed with Re: or similar with no
intervening space.
modified:
Mailman/Queue/CommandRunner.py
NEWS
--
lp:mailman/2.2
https://code.launchpad.net/~mailman-coders/mailman/2.2
Your team Mailman Checkins is subscribed to branch lp:mailman/2.2.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.2/+edit-subscription
=== modified file 'Mailman/Queue/CommandRunner.py'
--- Mailman/Queue/CommandRunner.py 2011-02-07 20:01:02 +0000
+++ Mailman/Queue/CommandRunner.py 2014-12-08 04:53:04 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2011 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2014 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -138,9 +138,17 @@
# localized version thereof) on the Subject: line that's messing
# things up. Pop the prefix off and try again... once.
#
+ # At least one MUA (163.com web mail) has been observed that
+ # inserts 'Re:' with no following space, so try to account for
+ # that too.
+ #
# If that still didn't work it isn't enough to stop processing.
# BAW: should we include a message that the Subject: was ignored?
- if not self.subjcmdretried and args:
+ if self.subjcmdretried < 1:
+ self.subjcmdretried += 1
+ if re.search('^.*:.+', cmd):
+ return self.do_command(re.sub('.*:', '', cmd), args)
+ if self.subjcmdretried < 2 and args:
self.subjcmdretried += 1
cmd = args.pop(0)
return self.do_command(cmd, args)
=== modified file 'NEWS'
--- NEWS 2014-11-28 20:45:39 +0000
+++ NEWS 2014-12-08 04:53:04 +0000
@@ -77,6 +77,9 @@
Bug fixes and other patches
+ - Accept email command in Subject: prefixed with Re: or similar with no
+ intervening space. (LP: #1400200)
+
- Fixed a UnicodeDecodeError that could occur in the web admin interface
if 'text' valued attributes have unicode values. (LP: #1397170)
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
