Merged r9924 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9960 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/models/mail_handler.rb

@@ -44,8 +44,8 @@ class MailHandler < ActionMailer::Base
 
   cattr_accessor :ignored_emails_headers
   @@ignored_emails_headers = {
-    'X-Auto-Response-Suppress' => 'OOF',
+    'X-Auto-Response-Suppress' => 'oof',
-    'Auto-Submitted' => 'auto-replied'
+    'Auto-Submitted' => /^auto-/
   }
 
   # Processes incoming emails
@@ -63,11 +63,14 @@ class MailHandler < ActionMailer::Base
     # Ignore auto generated emails
     self.class.ignored_emails_headers.each do |key, ignored_value|
       value = email.header_string(key)
-      if value && value.to_s.downcase == ignored_value.downcase
+      if value
-        if logger && logger.info
+        value = value.to_s.downcase
-          logger.info "MailHandler: ignoring email with #{key}:#{value} header"
+        if (ignored_value.is_a?(Regexp) && value.match(ignored_value)) || value == ignored_value
+          if logger && logger.info
+            logger.info "MailHandler: ignoring email with #{key}:#{value} header"
+          end
+          return false
         end
-        return false
       end
     end
     @user = User.find_by_mail(sender_email) if sender_email.present?

doc/CHANGELOG

@@ -8,6 +8,7 @@ http://www.redmine.org/
 
 * Defect #11192: Make repository identifier accept underscores
 * Defect #11307: Can't filter for negative numeric custom fields
+* Feature #11338: Exclude emails with auto-submitted => auto-generated
 * Patch #11328: Fix Japanese mistranslation for 'label_language_based'
 
 == 2012-06-18 v1.4.4

test/unit/mail_handler_test.rb

@@ -363,7 +363,8 @@ class MailHandlerTest < ActiveSupport::TestCase
     [
       "X-Auto-Response-Suppress: OOF",
       "Auto-Submitted: auto-replied",
-      "Auto-Submitted: Auto-Replied"
+      "Auto-Submitted: Auto-Replied",
+      "Auto-Submitted: auto-generated"
     ].each do |header|
       raw = IO.read(File.join(FIXTURES_PATH, 'ticket_on_given_project.eml'))
       raw = header + "\n" + raw