Change default behavior for safety.

2 files changed, 10 insertions, 4 deletions

diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in
index 158d665a..eac2ad73 100644
--- a/Mailman/Defaults.py.in
+++ b/Mailman/Defaults.py.in
@@ -260,10 +260,13 @@ PRIVATE_EXTERNAL_ARCHIVER = No
 # should modify the Message object as necessary.
 ARCHIVE_SCRUBBER = 'Mailman.Handlers.Scrubber'
 
-# Mailman.Handlers.Scrubber uses attachment's filename as is.
-# If you don't like this (extremely long mime-encoded filename) then set
-# this True.
-SCRUBBER_DONT_USE_ATTACHMENT_FILENAME = False
+# Control parameter whether Mailman.Handlers.Scrubber should use message
+# attachment's filename as is indicated by the filename parameter or use
+# 'attachement-xxx' instead.  The default is set True because the applications
+# on PC and Mac begin to use longer non-ascii filenames.  Historically, it
+# was set False in 2.1.6 for backward compatiblity but it was reset to True
+# for safer operation in mailman-2.1.7. 
+SCRUBBER_DONT_USE_ATTACHMENT_FILENAME = True
 
 # Use of attachment filename extension per se is may be dangerous because
 # virus fakes it. You can set this True if you filter the attachment by
diff --git a/NEWS b/NEWS
index 3055a55e..4e4505ab 100644
--- a/NEWS
+++ b/NEWS
@@ -45,6 +45,9 @@ Here is a history of user visible changes to Mailman.
 
   Bug fixes and other patches
 
+    - Defaults.py.in: SCRUBBER_DONT_USE_ATTACHMENT_FILENAME is set to True
+      for safer operation.
+
     - Fix Scrubber.py mungs quoted-printable bug with introducing
       'X-Mailman-Scrubbed' header for marking that the payload is
       scrubber-munged.  The flag is referenced in ToDigest.py, ToArchive.py,