* X-BeenThere: headers were being overwritten every time they reached

   a new mailing list -- changed to append a new header per list (so
   that multi-list loops can be detected).
 * Set Reply-To: header to point back to list, if
   mlist.reply_goes_to_list is true and msg.fastrack is false/unset.

1 files changed, 6 insertions, 1 deletions

diff --git a/Mailman/Handlers/CookHeaders.py b/Mailman/Handlers/CookHeaders.py
index 5efa26d61..4349c1004 100644
--- a/Mailman/Handlers/CookHeaders.py
+++ b/Mailman/Handlers/CookHeaders.py
@@ -51,7 +51,7 @@ def process(mlist, msg):
     msg['Errors-To'] = adminaddr
     #
     # Mark message so we know we've been here
-    msg['X-BeenThere'] = mlist.GetListEmail()
+    msg.headers.append('X-BeenThere: %s\n' % mlist.GetListEmail())
     #
     # Add Precedence: and other useful headers.  None of these are standard
     # and finding information on some of them are fairly difficult.  Some are
@@ -68,6 +68,11 @@ def process(mlist, msg):
     if not msg.get('precedence'):
         msg['Precedence'] = 'bulk'
     #
+    # Set Reply-To: header to point back to list, if the list is so
+    # inclined.
+    if mlist.reply_goes_to_list and not getattr(msg, 'fastrack', 0):
+        msg['reply-to'] = 'Reply-To: %s\n' % mlist.GetListEmail()
+    #
     # Other list related non-standard headers.  Defined in:
     #
     # Grant Neufeld and Joshua D. Baer: The Use of URLs as Meta-Syntax for