From: Austin Clements <amdragon@MIT.EDU>
Date: Tue, 6 Mar 2012 18:48:38 +0000 (+0000)
Subject: test: Fix malformed multipart message
X-Git-Tag: 0.13_rc1~155
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=046ab77b1045596ab225296987401fe95eb2fe13;p=notmuch.git

test: Fix malformed multipart message

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.
---

diff --git a/test/multipart b/test/multipart
index 0ac96d52..e73cd8b8 100755
--- a/test/multipart
+++ b/test/multipart
@@ -46,6 +46,7 @@ Content-Disposition: inline
 EOF
 cat embedded_message >> ${MAIL_DIR}/multipart
 cat <<EOF >> ${MAIL_DIR}/multipart
+
 --=-=-=
 Content-Disposition: attachment; filename=attachment