Made several improvements to bounce recognition.

1 files changed, 101 insertions, 0 deletions

diff --git a/tests/bounces/dsn_17.txt b/tests/bounces/dsn_17.txt
new file mode 100644
index 00000000..2fc60838
--- /dev/null
+++ b/tests/bounces/dsn_17.txt
@@ -0,0 +1,101 @@
+From: "Mail Delivery System" <MAILER-DAEMON@be37.mail.saunalahti.fi>
+To: <pray4-team-bounces@strategicnetwork.org>
+Subject: Delayed Mail (still being retried)
+Date: Sun, 4 May 2008 13:30:10 +0800
+Message-ID: <20080504053010.83D5413301A@be37.mail.saunalahti.fi>
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+	boundary="----=_NextPart_000_00B7_01C8B0E9.3E667630"
+X-Mailer: Microsoft Office Outlook 12.0
+Thread-Index: Acitp+yPLzjU0sphReGZRtBo3Ns6bg==
+
+This is a multipart message in MIME format.
+
+------=_NextPart_000_00B7_01C8B0E9.3E667630
+Content-Type: text/plain;
+	report-type=delivery-status;
+	boundary="ED106133145.1209879010/be37.mail.saunalahti.fi";
+	charset="US-ASCII"
+Content-Transfer-Encoding: 7bit
+
+This is the mail system at host be37.mail.saunalahti.fi.
+
+####################################################################
+# THIS IS A WARNING ONLY.  YOU DO NOT NEED TO RESEND YOUR MESSAGE. #
+####################################################################
+
+Your message could not be delivered for more than 15 minutes.
+It will be retried until it is 24 hours old.
+
+For further assistance, please contact your postmaster.
+
+If you do so, please include this problem report. You can
+delete your own text from the attached returned message.
+
+                   The mail system
+
+<kb3543.50@be37.mail.saunalahti.fi> (expanded from
+    <kb3543@be37.mail.saunalahti.fi>): temporary failure. Command output:
+Quota
+    exceeded message delivery failed to /mail/mbx/p/5/kb3543/INBOX
+
+------=_NextPart_000_00B7_01C8B0E9.3E667630
+Content-Type: message/delivery-status;
+	name="details.txt"
+Content-Transfer-Encoding: 7bit
+Content-Disposition: attachment;
+	filename="details.txt"
+
+Reporting-MTA: dns; be37.mail.saunalahti.fi
+X-Postfix-Queue-ID: ED106133145
+X-Postfix-Sender: rfc822; pray4-team-bounces@strategicnetwork.org
+Arrival-Date: Sun,  4 May 2008 05:51:07 +0300 (EEST)
+
+Final-Recipient: rfc822; kb3543.50@be37.mail.saunalahti.fi
+Original-Recipient: rfc822;christine.barsas@sivarikeskus.fi
+Action: delayed
+Status: 4.3.0
+Diagnostic-Code: x-unix; Quota exceeded message delivery failed to
+	/mail/mbx/p/5/kb3543/INBOX
+Will-Retry-Until: Mon,  5 May 2008 05:51:07 +0300 (EEST)
+
+------=_NextPart_000_00B7_01C8B0E9.3E667630
+Content-Type: text/rfc822-headers;
+	name="Undelivered Message Headers.txt"
+Content-Transfer-Encoding: quoted-printable
+Content-Disposition: attachment;
+	filename="Undelivered Message Headers.txt"
+
+Received: from emh07.mail.saunalahti.fi (emh07.mail.saunalahti.fi =
+[62.142.5.117])
+	by be37.mail.saunalahti.fi (Postfix) with ESMTP id ED106133145
+	for <kb3543@be37.mail.saunalahti.fi>; Sun,  4 May 2008 05:51:07 +0300 =
+(EEST)
+Received: from strategicnetwork.org (strategicnetwork.org =
+[66.35.39.241])
+	by emh07.mail.saunalahti.fi (Postfix) with ESMTP id D3C661C639E
+	for <christine.barsas@sivarikeskus.fi>; Sun,  4 May 2008 05:51:06 +0300 =
+(EEST)
+Received: from localhost.localdomain (localhost.localdomain [127.0.0.1])
+	by strategicnetwork.org (Postfix) with ESMTP id 27DF4734B75
+	for <christine.barsas@sivarikeskus.fi>; Sat,  3 May 2008 20:51:05 -0600 =
+(MDT)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=3D"us-ascii"
+Content-Transfer-Encoding: 7bit
+From: pray4-team-request@strategicnetwork.org
+To: christine.barsas@sivarikeskus.fi
+Subject: confirm d35a398026f31a7462cc90622a1e6180cd63ba60
+Reply-To: pray4-team-request@strategicnetwork.org
+Message-ID: =
+<mailman.150418.1209869464.31038.pray4-team@strategicnetwork.org>
+Date: Sat, 03 May 2008 20:51:04 -0600
+Precedence: bulk
+X-BeenThere: pray4-team@strategicnetwork.org
+X-Mailman-Version: 2.1.5
+List-Id: pray4-team.strategicnetwork.org
+X-List-Administrivia: yes
+Sender: pray4-team-bounces@strategicnetwork.org
+Errors-To: pray4-team-bounces@strategicnetwork.org
+
+------=_NextPart_000_00B7_01C8B0E9.3E667630--