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