c9/45145eb6a29f0d438b793c22c1673cdc0a16f6

   1 Return-Path: <amthrax@drake.mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 1B807431FD2\r
   6         for <notmuch@notmuchmail.org>; Tue,  6 Mar 2012 10:48:52 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id UO1eSUppyFIk for <notmuch@notmuchmail.org>;\r
  16         Tue,  6 Mar 2012 10:48:51 -0800 (PST)\r
  17 Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU\r
  18         [18.9.25.15])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 4A18C431FC9\r
  20         for <notmuch@notmuchmail.org>; Tue,  6 Mar 2012 10:48:51 -0800 (PST)\r
  21 X-AuditID: 1209190f-b7f8a6d000000914-20-4f565c1249ba\r
  22 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
  23         by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 07.09.02324.21C565F4; Tue,  6 Mar 2012 13:48:50 -0500 (EST)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q26Imorb020734; \r
  27         Tue, 6 Mar 2012 13:48:50 -0500\r
  28 Received: from drake.mit.edu (firewall.royalsociety.org [193.63.75.2])\r
  29         (authenticated bits=0)\r
  30         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  31         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q26ImmJ4016462\r
  32         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  33         Tue, 6 Mar 2012 13:48:50 -0500 (EST)\r
  34 Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
  35         (envelope-from <amthrax@drake.mit.edu>)\r
  36         id 1S4zRH-0003pI-Uc; Tue, 06 Mar 2012 18:48:48 +0000\r
  37 From: Austin Clements <amdragon@MIT.EDU>\r
  38 To: notmuch@notmuchmail.org\r
  39 Subject: [PATCH v2 2/8] test: Fix malformed multipart message\r
  40 Date: Tue,  6 Mar 2012 18:48:38 +0000\r
  41 Message-Id: <1331059724-14653-3-git-send-email-amdragon@mit.edu>\r
  42 X-Mailer: git-send-email 1.7.7.3\r
  43 In-Reply-To: <1331059724-14653-1-git-send-email-amdragon@mit.edu>\r
  44 References: <1330752025-2542-1-git-send-email-amdragon@mit.edu>\r
  45         <1331059724-14653-1-git-send-email-amdragon@mit.edu>\r
  46 X-Brightmail-Tracker:\r
  47  H4sIAAAAAAAAA+NgFtrFIsWRmVeSWpSXmKPExsUixG6nrisUE+Zv8PGQhcWefV4W12/OZHZg\r
  48         8rh7msvj2apbzAFMUVw2Kak5mWWpRfp2CVwZW+9MYi+4wFkxYdchlgbGW+xdjJwcEgImEt0z\r
  49         W5kgbDGJC/fWs3UxcnEICexjlJh8YScrhLOeUeLSn/nsEM5BJolfXd1QZfMZJR5vWscM0s8m\r
  50         oCGxbf9yRhBbREBaYufd2UDtHBzMAk4SbW1eIKawgK3Em+/6IBUsAqoSN16/BbuCV8BBYt7K\r
  51         CawQVyhInFt9DizOKeAosefpJrCJQgJlEpduXmCZwMi/gJFhFaNsSm6Vbm5iZk5xarJucXJi\r
  52         Xl5qka6JXm5miV5qSukmRlAQcUry72D8dlDpEKMAB6MSD2+Vbpi/EGtiWXFl7iFGSQ4mJVHe\r
  53         nCigEF9SfkplRmJxRnxRaU5q8SFGCQ5mJRHeb+9D/YV4UxIrq1KL8mFS0hwsSuK8alrv/IQE\r
  54         0hNLUrNTUwtSi2CyMhwcShK8GdFAQwWLUtNTK9Iyc0oQ0kwcnCDDeYCGG4HU8BYXJOYWZ6ZD\r
  55         5E8xKkqJ8/qBJARAEhmleXC9sCh/xSgO9Iowbx1IFQ8wQcB1vwIazAQ0uE05GGRwSSJCSqqB\r
  56         0TNM74//0TbdyPy7dTttnKdu3an8ODnsvqJkMNv75zzRlv3L9vfdffB5SlLuXraZbo5bDyX1\r
  57         OlkcUrHMWMzbWzAruNYxZZ5arL/nojsdpw078hPcb32uqr83Let53Z/8fzNfCe9q7vH8LJ+n\r
  58         mxaw6+fNrp2n0/fPXLTipJZQiMFs64Lz3fM5lFiKMxINtZiLihMBmm6hu80CAAA=\r
  59 X-BeenThere: notmuch@notmuchmail.org\r
  60 X-Mailman-Version: 2.1.13\r
  61 Precedence: list\r
  62 List-Id: "Use and development of the notmuch mail system."\r
  63         <notmuch.notmuchmail.org>\r
  64 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  65         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  66 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  67 List-Post: <mailto:notmuch@notmuchmail.org>\r
  68 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  69 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  70         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  71 X-List-Received-Date: Tue, 06 Mar 2012 18:48:52 -0000\r
  72 \r
  73 Previously, there was only one CRLF between the terminating boundary\r
  74 of the embedded multipart/alternative and the boundary of the\r
  75 containing multipart.  However, according the RFC 1341, 7.2.1:\r
  76 \r
  77   The boundary must be followed immediately either by another CRLF and\r
  78   the header fields for the next part, or by two CRLFs, in which case\r
  79   there are no header fields for the next part\r
  80 \r
  81 and\r
  82 \r
  83   The CRLF preceding the encapsulation line is considered part of the\r
  84   boundary so that it is possible to have a part that does not end\r
  85   with a CRLF (line break).\r
  86 \r
  87 Thus, there must be *two* CRLFs between these boundaries: one that\r
  88 ends the terminating boundary and one that begins the enclosing\r
  89 boundary.\r
  90 \r
  91 While GMime accepted the message we had before, it could not produce\r
  92 such a message.\r
  93 ---\r
  94  test/multipart |    1 +\r
  95  1 files changed, 1 insertions(+), 0 deletions(-)\r
  96 \r
  97 diff --git a/test/multipart b/test/multipart\r
  98 index d36a65d..475c6a2 100755\r
  99 --- a/test/multipart\r
 100 +++ b/test/multipart\r
 101 @@ -46,6 +46,7 @@ Content-Disposition: inline\r
 102  EOF\r
 103  cat embedded_message >> ${MAIL_DIR}/multipart\r
 104  cat <<EOF >> ${MAIL_DIR}/multipart\r
 105 +\r
 106  --=-=-=\r
 107  Content-Disposition: attachment; filename=attachment\r
 108  \r
 109 -- \r
 110 1.7.7.3\r
 111 \r