[PATCH v2 2/8] test: Fix malformed multipart message

diff --git a/c9/45145eb6a29f0d438b793c22c1673cdc0a16f6 b/c9/45145eb6a29f0d438b793c22c1673cdc0a16f6
new file mode 100644 (file)
index 0000000..8c0bd33
--- /dev/null
+++ b/c9/45145eb6a29f0d438b793c22c1673cdc0a16f6
@@ -0,0 +1,111 @@
+Return-Path: <amthrax@drake.mit.edu>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 1B807431FD2\r
+       for <notmuch@notmuchmail.org>; Tue,  6 Mar 2012 10:48:52 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id UO1eSUppyFIk for <notmuch@notmuchmail.org>;\r
+       Tue,  6 Mar 2012 10:48:51 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU\r
+       [18.9.25.15])\r
+       by olra.theworths.org (Postfix) with ESMTP id 4A18C431FC9\r
+       for <notmuch@notmuchmail.org>; Tue,  6 Mar 2012 10:48:51 -0800 (PST)\r
+X-AuditID: 1209190f-b7f8a6d000000914-20-4f565c1249ba\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+       by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 07.09.02324.21C565F4; Tue,  6 Mar 2012 13:48:50 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q26Imorb020734; \r
+       Tue, 6 Mar 2012 13:48:50 -0500\r
+Received: from drake.mit.edu (firewall.royalsociety.org [193.63.75.2])\r
+       (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q26ImmJ4016462\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Tue, 6 Mar 2012 13:48:50 -0500 (EST)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amthrax@drake.mit.edu>)\r
+       id 1S4zRH-0003pI-Uc; Tue, 06 Mar 2012 18:48:48 +0000\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 2/8] test: Fix malformed multipart message\r
+Date: Tue,  6 Mar 2012 18:48:38 +0000\r
+Message-Id: <1331059724-14653-3-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <1331059724-14653-1-git-send-email-amdragon@mit.edu>\r
+References: <1330752025-2542-1-git-send-email-amdragon@mit.edu>\r
+       <1331059724-14653-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrFIsWRmVeSWpSXmKPExsUixG6nrisUE+Zv8PGQhcWefV4W12/OZHZg\r
+       8rh7msvj2apbzAFMUVw2Kak5mWWpRfp2CVwZW+9MYi+4wFkxYdchlgbGW+xdjJwcEgImEt0z\r
+       W5kgbDGJC/fWs3UxcnEICexjlJh8YScrhLOeUeLSn/nsEM5BJolfXd1QZfMZJR5vWscM0s8m\r
+       oCGxbf9yRhBbREBaYufd2UDtHBzMAk4SbW1eIKawgK3Em+/6IBUsAqoSN16/BbuCV8BBYt7K\r
+       CawQVyhInFt9DizOKeAosefpJrCJQgJlEpduXmCZwMi/gJFhFaNsSm6Vbm5iZk5xarJucXJi\r
+       Xl5qka6JXm5miV5qSukmRlAQcUry72D8dlDpEKMAB6MSD2+Vbpi/EGtiWXFl7iFGSQ4mJVHe\r
+       nCigEF9SfkplRmJxRnxRaU5q8SFGCQ5mJRHeb+9D/YV4UxIrq1KL8mFS0hwsSuK8alrv/IQE\r
+       0hNLUrNTUwtSi2CyMhwcShK8GdFAQwWLUtNTK9Iyc0oQ0kwcnCDDeYCGG4HU8BYXJOYWZ6ZD\r
+       5E8xKkqJ8/qBJARAEhmleXC9sCh/xSgO9Iowbx1IFQ8wQcB1vwIazAQ0uE05GGRwSSJCSqqB\r
+       0TNM74//0TbdyPy7dTttnKdu3an8ODnsvqJkMNv75zzRlv3L9vfdffB5SlLuXraZbo5bDyX1\r
+       OlkcUrHMWMzbWzAruNYxZZ5arL/nojsdpw078hPcb32uqr83Let53Z/8fzNfCe9q7vH8LJ+n\r
+       mxaw6+fNrp2n0/fPXLTipJZQiMFs64Lz3fM5lFiKMxINtZiLihMBmm6hu80CAAA=\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 06 Mar 2012 18:48:52 -0000\r
+\r
+Previously, there was only one CRLF between the terminating boundary\r
+of the embedded multipart/alternative and the boundary of the\r
+containing multipart.  However, according the RFC 1341, 7.2.1:\r
+\r
+  The boundary must be followed immediately either by another CRLF and\r
+  the header fields for the next part, or by two CRLFs, in which case\r
+  there are no header fields for the next part\r
+\r
+and\r
+\r
+  The CRLF preceding the encapsulation line is considered part of the\r
+  boundary so that it is possible to have a part that does not end\r
+  with a CRLF (line break).\r
+\r
+Thus, there must be *two* CRLFs between these boundaries: one that\r
+ends the terminating boundary and one that begins the enclosing\r
+boundary.\r
+\r
+While GMime accepted the message we had before, it could not produce\r
+such a message.\r
+---\r
+ test/multipart |    1 +\r
+ 1 files changed, 1 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/test/multipart b/test/multipart\r
+index d36a65d..475c6a2 100755\r
+--- a/test/multipart\r
++++ b/test/multipart\r
+@@ -46,6 +46,7 @@ Content-Disposition: inline\r
+ EOF\r
+ cat embedded_message >> ${MAIL_DIR}/multipart\r
+ cat <<EOF >> ${MAIL_DIR}/multipart\r
++\r
+ --=-=-=\r
+ Content-Disposition: attachment; filename=attachment\r
+ \r
+-- \r
+1.7.7.3\r
+\r