Commit e45e718a authored by Matthias Andree's avatar Matthias Andree

mimedecode: Fix multipart/mixed detection.

Fixes a regression introduced in release 5.0.0 in March 1999 that was
attributed to Henrik Storner.
parent 2cfbcf4d
......@@ -91,6 +91,12 @@ NOTE THIS IS AN ALPHA RELEASE THAT HAS NOT BEEN THOROUGHLY TESTED!
will actively forbid SSLv2 negotiation by means of SSL_OP_NO_SSLv2.
To fix Debian Bug#622054.
# REGRESSION FIXES
* The mimedecode feature now properly detects multipart/mixed-type matches, so
that quoted-printable-encoded multipart messages can get decoded.
(Regression in 5.0.0 on 1999-03-27, as a side effect of a PGP-mimedecode fix
attributed to Henrik Storner.)
# CHANGES
* A foreground fetchmail can now accept a few more options while another copy is
running in the background.
......
......@@ -459,7 +459,7 @@ int MimeBodyType(char *hdrs, int WantDecode)
/* Check Content-Type to see if this is a multipart message */
if ( (CntType != NULL) &&
((strncasecmp(CntType, "multipart/mixed", 16) == 0) ||
((strncasecmp(CntType, "multipart/mixed", 15) == 0) ||
(strncasecmp(CntType, "message/", 8) == 0)) ) {
char *p1 = GetBoundary(CntType);
......@@ -469,7 +469,6 @@ int MimeBodyType(char *hdrs, int WantDecode)
the boundary string */
strcpy(MultipartDelimiter, "--");
strlcat(MultipartDelimiter, p1, sizeof(MultipartDelimiter));
MultipartDelimiter[sizeof(MultipartDelimiter)-1] = '\0';
BodyType = (MSG_IS_8BIT | MSG_NEEDS_DECODE);
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment