Upstream changes

3 files changed, 72 insertions, 0 deletions

diff --git a/tests/bounces/qmail_08.txt b/tests/bounces/qmail_08.txt
new file mode 100644
index 00000000..583d94aa
--- /dev/null
+++ b/tests/bounces/qmail_08.txt
@@ -0,0 +1,24 @@
+From contact@example.com  Mon Mar 18 11:39:41 2013
+Return-Path: <contact@example.com>
+X-Original-To: noreply@example.org
+Delivered-To: noreply@example.org
+Received: from example.com (example.com [1.2.3.4])
+	by worker1.example.org (Postfix) with ESMTP id 58C7E14C1208
+	for <noreply@example.org>; Mon, 18 Mar 2013 11:39:40 +0000 (GMT)
+Received: from contact by example.com with local (Exim 4.80)
+	(envelope-from <contact@example.com>)
+	id 1UHYPj-0001DB-Ij
+	for noreply@example.org; Mon, 18 Mar 2013 06:39:39 -0500
+To: "Example Sender" <noreply@example.org>
+MIME-Version: 1.0
+Precedence: auto_reply
+X-Precedence: auto_reply
+From: "Example user" <contact@example.com>
+Content-type: text/plain; charset=ansi_x3.110-1983
+Subject: Auto reply
+Message-Id: <E1UHYPj-0001DB-Ij@example.com>
+Date: Mon, 18 Mar 2013 06:39:39 -0500
+X-Comment: qmail detector would throw UnicodeDecodeError on this message
+X-Comment: when running under Python 2.x.  Bug LP: 1074592.
+
+Gracias por contactar con nosotros!! en este instante estamos procesando la respuesta a tu consulta, a la mayor brevedad posible tendr疽 noticias nuestras...
diff --git a/tests/bounces/simple_39.txt b/tests/bounces/simple_39.txt
new file mode 100644
index 00000000..1b46ff92
--- /dev/null
+++ b/tests/bounces/simple_39.txt
@@ -0,0 +1,32 @@
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Auto-Submitted: auto-replied
+Date: Wed, 07 Nov 2012 10:47:34 +0400
+From: Mail Delivery System <Mailer-Daemon@mx183.mail.ru>
+Message-Id: <E1TVzQE-0003uW-ED@mx183.mail.ru>
+Subject: =?utf-8?b?0JLQsNGI0LUg0YHQvtC+0LHRidC10L3QuNC1INC90LUg0LTQvtGB0YLQsNCy0LvQ?=
+	=?utf-8?b?tdC90L4uIE1haWwgZmFpbHVyZS4=?=
+To: noreply@example.com
+Content-Transfer-Encoding: 8bit
+
+ﾐｭﾑひｾ ﾐｿﾐｸﾑ�ﾑ糊ｼﾐｾ ﾑ�ﾐｾﾐｷﾐｴﾐｰﾐｽﾐｾ ﾐｰﾐｲﾑひｾﾐｼﾐｰﾑひｸﾑ�ﾐｵﾑ�ﾐｺﾐｸ ﾑ�ﾐｵﾑ�ﾐｲﾐｵﾑ�ﾐｾﾐｼ Mail.Ru, ﾐｾﾑひｲﾐｵﾑ�ﾐｰﾑび� ﾐｽﾐｰ ﾐｽﾐｵﾐｳﾐｾ ﾐｽﾐｵ ﾐｽﾑσｶﾐｽﾐｾ.
+
+ﾐ� ﾑ�ﾐｾﾐｶﾐｰﾐｻﾐｵﾐｽﾐｸﾑ�, ﾐ漬ｰﾑ威ｵ ﾐｿﾐｸﾑ�ﾑ糊ｼﾐｾ ﾐｽﾐｵ ﾐｼﾐｾﾐｶﾐｵﾑ� ﾐｱﾑ錦び� ﾐｴﾐｾﾑ�ﾑひｰﾐｲﾐｻﾐｵﾐｽﾐｾ ﾐｾﾐｴﾐｽﾐｾﾐｼﾑ� ﾐｸﾐｻﾐｸ ﾐｽﾐｵﾑ�ﾐｺﾐｾﾐｻﾑ糊ｺﾐｸﾐｼ ﾐｿﾐｾﾐｻﾑτ�ﾐｰﾑひｵﾐｻﾑ紹ｼ, ﾐｿﾐｾﾑひｾﾐｼﾑ� ﾑ�ﾑひｾ:
+
+  Message was not accepted -- invalid mailbox.
+ Local mailbox foo@mail.ru is unavailable: user not found
+
+**********************
+
+A message that you sent was rejected by the local scanning code that
+checks incoming messages on this system. The following error was given:
+
+  Message was not accepted -- invalid mailbox.
+ Local mailbox foo@mail.ru is unavailable: user not found
+
+------ This is a copy of your message, including all the headers.
+------ No more than 1K characters of the body are included.
+
+Received: from mail by mx183.mail.ru with local (envelope-from <noreply@example.com>)
+	id 1TVzQE-0003tT-Co
+	for foo@mail.ru; Wed, 07 Nov 2012 10:47:34 +0400
diff --git a/tests/bounces/yahoo_11.txt b/tests/bounces/yahoo_11.txt
new file mode 100644
index 00000000..6e9692a6
--- /dev/null
+++ b/tests/bounces/yahoo_11.txt
@@ -0,0 +1,16 @@
+From: MAILER-DAEMON@yahoo.com
+To: user@bellsouth.net
+Date: Wed, 20 Feb 2013 15:50:26 -0000
+Subject: Failure Notice
+
+Sorry, we were unable to deliver your message to the following address.
+
+<bad_user@aol.com>:
+Remote host said: 550 5.1.1 <bad_user@aol.com>: Recipient address rejected: aol.com [RCPT_TO]
+
+--- Below this line is a copy of the message.
+
+The following should not be found as we should have stopped looking.
+
+<bogus@dont.find.me.invalid>:
+