Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for 168097. Need to fetch MIME headers for message/rfc822 body part if it is enclosed in the msg body (most likely as a body part of a multipart/mixed msg). r=ducarroz, sr=sspitzer.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@139708 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cavin%netscape.com 2003-03-18 22:46:14 +00:00
parent b31120cdf8
commit bda52cf465
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/mailnews/imap/src/nsIMAPBodyShell.cpp
View File

@ -1050,9 +1050,23 @@ PRInt32 nsIMAPBodypartMessage::Generate(PRBool stream, PRBool prefetch)
if (!m_topLevelMessage && !m_shell->GetPseudoInterrupted()) // not the top-level message - we need the MIME header as well as the message header
{
// but we don't need the MIME header of a message/rfc822 part!
if (PL_strcasecmp(m_bodyType, "message") || PL_strcasecmp(m_bodySubType, "rfc822"))
m_contentLength += GenerateMIMEHeader(stream, prefetch);
// but we don't need the MIME headers of a message/rfc822 part if this content
// type is in (part of) the main msg header. In other words, we still need
// these MIME headers if this message/rfc822 body part is enclosed in the msg
// body (most likely as a body part of a multipart/mixed msg).
// Don't fetch (bug 128888) Do fetch (bug 168097)
// ---------------------------------- -----------------------------------
// message/rfc822 (parent part) message/rfc822
// message/rfc822 <<<--- multipart/mixed (parent part)
// multipart/mixed message/rfc822 <<<---
// text/html (body text) multipart/mixed
// text/plain (attachment) text/html (body text)
// application/msword (attachment) text/plain (attachment)
// application/msword (attachment)
// "<<<---" points to the part we're examining here.
if ( PL_strcasecmp(m_bodyType, "message") || PL_strcasecmp(m_bodySubType, "rfc822") ||
PL_strcasecmp(m_parentPart->GetBodyType(), "message") || PL_strcasecmp(m_parentPart->GetBodySubType(), "rfc822") )
m_contentLength += GenerateMIMEHeader(stream, prefetch);
}
if (!m_shell->GetPseudoInterrupted())