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

fix 272988 handle dovecot imap server sending size after message headers when downloading headers, sr=mscott

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@170068 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bienvenu%nventure.com
2005-03-02 01:12:35 +00:00
parent 9d6e91c175
commit 1d33f6fe83
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mozilla/mailnews/imap/src/nsImapServerResponseParser.cpp
View File

@@ -96,6 +96,7 @@ nsImapServerResponseParser::nsImapServerResponseParser(nsImapProtocol &imapProto
fStatusRecentMessages = 0;
fStatusNextUID = nsMsgKey_None;
fStatusExistingMessages = 0;
fReceivedHeaderOrSizeForUID = nsMsgKey_None;
}
nsImapServerResponseParser::~nsImapServerResponseParser()
@@ -183,6 +184,7 @@ void nsImapServerResponseParser::InitializeState()
fProcessingTaggedResponse = PR_FALSE;
fCurrentCommandFailed = PR_FALSE;
fNumberOfRecentMessages = 0;
fReceivedHeaderOrSizeForUID = nsMsgKey_None;
}
void nsImapServerResponseParser::ParseIMAPServerResponse(const char *currentCommand, PRBool aIgnoreBadAndNOResponses)
@@ -1202,8 +1204,16 @@ void nsImapServerResponseParser::msg_fetch()
AdvanceToNextToken();
if (ContinueParse())
{
PRBool sendEndMsgDownload = (GetDownloadingHeaders()
&& fReceivedHeaderOrSizeForUID == CurrentResponseUID());
fSizeOfMostRecentMessage = atoi(fNextToken);
fReceivedHeaderOrSizeForUID = CurrentResponseUID();
if (sendEndMsgDownload)
{
fServerConnection.NormalMessageEndDownload();
fReceivedHeaderOrSizeForUID = nsMsgKey_None;
}
// if we are in the process of fetching everything RFC822 then we should
// turn around and force the total download size to be set to this value.
// this helps if the server gaves us a bogus size for the message in response to the
@@ -2050,7 +2060,15 @@ void nsImapServerResponseParser::msg_fetch_content(PRBool chunk, PRInt32 origin,
{
// complete the message download
if (ContinueParse())
fServerConnection.NormalMessageEndDownload();
{
if (fReceivedHeaderOrSizeForUID == CurrentResponseUID())
{
fServerConnection.NormalMessageEndDownload();
fReceivedHeaderOrSizeForUID = nsMsgKey_None;
}
else
fReceivedHeaderOrSizeForUID = CurrentResponseUID();
}
else
fServerConnection.AbortMessageDownLoad();
}

2
mozilla/mailnews/imap/src/nsImapServerResponseParser.h
View File

@@ -238,6 +238,8 @@ private:
PRInt32 fNumberOfRecentMessages;
PRUint32 fCurrentResponseUID;
PRUint32 fHighestRecordedUID;
// used to handle server that sends msg size after headers
PRUint32 fReceivedHeaderOrSizeForUID;
PRInt32 fSizeOfMostRecentMessage;
PRInt32 fTotalDownloadSize;