summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mailman/MailCommandHandler.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/Mailman/MailCommandHandler.py b/Mailman/MailCommandHandler.py
index b342c41e9..d93cf6a1b 100644
--- a/Mailman/MailCommandHandler.py
+++ b/Mailman/MailCommandHandler.py
@@ -109,6 +109,12 @@ class MailCommandHandler:
self.AddToResponse(text, trunc=trunc, prefix=prefix)
def ParseMailCommands(self, msg):
+ # Break any infloops. If this has come from a Mailman server then
+ # it'll have this header. It's still possible to infloop between two
+ # servers because there's no guaranteed way to know it came from a
+ # bot.
+ if msg.get('x-beenthere') or msg.get('list-id'):
+ return
# check the autoresponse stuff
if self.autorespond_requests:
from Mailman.Handlers import Replybot