Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

handle stopped mailbox parse correctly, r=sspitzer

Browse Source
This commit is contained in:
bienvenu%netscape.com 2000-01-28 02:38:38 +00:00
parent 6f500172ae
commit 8d4331d084
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mailnews/local/src/nsMailboxProtocol.cpp
View File

@ -140,7 +140,7 @@ NS_IMETHODIMP nsMailboxProtocol::OnStopRequest(nsIChannel * aChannel, nsISupport
if (m_nextState == MAILBOX_READ_FOLDER && m_mailboxParser)
{
// we need to inform our mailbox parser that there is no more incoming data...
m_mailboxParser->OnStopRequest(aChannel, ctxt, 0, nsnull);
m_mailboxParser->OnStopRequest(aChannel, ctxt, aStatus, nsnull);
}
else if (m_nextState == MAILBOX_READ_MESSAGE)
{

13
mailnews/local/src/nsParseMailbox.cpp
View File

@ -126,7 +126,7 @@ NS_IMETHODIMP nsMsgMailboxParser::OnStartRequest(nsIChannel * /* aChannel */, ns
// stop binding is a "notification" informing us that the stream associated with aURL is going away.
NS_IMETHODIMP nsMsgMailboxParser::OnStopRequest(nsIChannel * /* aChannel */, nsISupports *ctxt, nsresult aStatus, const PRUnichar *aMsg)
{
DoneParsingFolder();
DoneParsingFolder(aStatus);
// what can we do? we can close the stream?
m_urlInProgress = PR_FALSE; // don't close the connection...we may be re-using it.
@ -259,13 +259,14 @@ int nsMsgMailboxParser::ProcessMailboxInputStream(nsIURI* aURL, nsIInputStream *
return (ret);
}
void nsMsgMailboxParser::DoneParsingFolder()
void nsMsgMailboxParser::DoneParsingFolder(nsresult status)
{
/* End of file. Flush out any partial line remaining in the buffer. */
FlushLastLine();
PublishMsgHeader();
if (m_mailDB) // finished parsing, so flush db folder info
// only mark the db valid if we've succeeded.
if (NS_SUCCEEDED(status) && m_mailDB) // finished parsing, so flush db folder info
UpdateDBFolderInfo();
// if (m_folder != nsnull)
@ -1503,7 +1504,7 @@ nsParseNewMailState::~nsParseNewMailState()
// This gets called for every message because libnet calls IncorporateBegin,
// IncorporateWrite (once or more), and IncorporateComplete for every message.
void nsParseNewMailState::DoneParsingFolder()
void nsParseNewMailState::DoneParsingFolder(nsresult status)
{
PRBool moved = PR_FALSE;
/* End of file. Flush out any partial line remaining in the buffer. */
@ -1980,9 +1981,9 @@ void ParseIMAPMailboxState::SetPublishByteLength(PRUint32 byteLength)
fNextMessageByteLength = byteLength;
}
void ParseIMAPMailboxState::DoneParsingFolder()
void ParseIMAPMailboxState::DoneParsingFolder(nsresult status)
{
nsMsgMailboxParser::DoneParsingFolder();
nsMsgMailboxParser::DoneParsingFolder(status);
if (m_mailDB)
{
// make sure the highwater mark is correct

6
mailnews/local/src/nsParseMailbox.h
View File

@ -161,7 +161,7 @@ public:
// message socket libnet callbacks, which come through folder pane
virtual int ProcessMailboxInputStream(nsIURI* aURL, nsIInputStream *aIStream, PRUint32 aLength);
virtual void DoneParsingFolder();
virtual void DoneParsingFolder(nsresult status);
virtual void AbortNewHeader();
virtual PRInt32 HandleLine(char *line, PRUint32 line_length);
@ -211,7 +211,7 @@ public:
NS_DECL_ISUPPORTS_INHERITED
nsresult Init(nsIFolder *rootFolder, nsFileSpec &folder, nsIOFileStream *inboxFileStream);
virtual void DoneParsingFolder();
virtual void DoneParsingFolder(nsresult status);
virtual void SetUsingTempDB(PRBool usingTempDB, char *tmpDBName);
void DisableFilters() {m_disableFilters = PR_TRUE;}
@ -260,7 +260,7 @@ public:
virtual ~ParseIMAPMailboxState();
// close the db
virtual void DoneParsingFolder();
virtual void DoneParsingFolder(nsresult status);
virtual void SetPublishUID(PRInt32 uid);
virtual void SetPublishByteLength(PRUint32 byteLength);