CiviCRM Patch for Amazon SES

gistfile1.diff

Index: civicrm-4.0.4/CRM/Mailing/BAO/Mailing.php
diff --git a/civicrm-4.0.4/CRM/Mailing/BAO/Mailing.php b/civicrm-4.0.4/CRM/Mailing/BAO/Mailing.php
index 2ee9ac79f89bed1232858c75b8c6a180a3335c91..f926712922a4d3ec6c38ad16d495f12d6db76945 100644
--- a/civicrm-4.0.4/CRM/Mailing/BAO/Mailing.php
+++ b/civicrm-4.0.4/CRM/Mailing/BAO/Mailing.php
@@ -1130,7 +1130,6 @@ AND    civicrm_mailing.id = civicrm_mailing_job.mailing_id";
         
         $headers['To'] = "$toName <$toEmail>";
         
-        $headers['Precedence'] = 'bulk';
         // Will test in the mail processor if the X-VERP is set in the bounced email.
         // (As an option to replace real VERP for those that can't set it up)
         $headers['X-CiviMail-Bounce'] = $verp['bounce'];
Index: civicrm-4.0.4/bin/EmailProcessor.php
diff --git a/civicrm-4.0.4/bin/EmailProcessor.php b/civicrm-4.0.4/bin/EmailProcessor.php
index 7ba270014721cb4e455a5da1509473a868acdcbd..ab11cbb2acf74dbfbec8906d07220931f4f3c919 100644
--- a/civicrm-4.0.4/bin/EmailProcessor.php
+++ b/civicrm-4.0.4/bin/EmailProcessor.php
@@ -152,7 +152,7 @@ class EmailProcessor {
         $regex = '/^' . preg_quote($dao->localpart) . '(b|c|e|o|r|u)' . $twoDigitString . '([0-9a-f]{16})@' . preg_quote($dao->domain) . '$/';
 
         // a tighter regex for finding bounce info in soft bounces’ mail bodies
-        $rpRegex = '/Return-Path: ' . preg_quote($dao->localpart) . '(b)' . $twoDigitString . '([0-9a-f]{16})@' . preg_quote($dao->domain) . '/';
+        $rpRegex = '/X-CiviMail-Bounce: ' . preg_quote($dao->localpart) . '(b)' . $twoDigitString . '([0-9a-f]{16})@' . preg_quote($dao->domain) . '/';
 
         // retrieve the emails
         require_once 'CRM/Mailing/MailStore.php';