зеркало из https://github.com/mozilla/pjs.git
Fixes for get new mail which should bring get new mail back to life for linux and mac. When we were told to wait for more data by the new nsMsgLineStreamBuffer, we weren't setting the pause for read flag in all cases.
This commit is contained in:
Родитель
a92eb5a8db
Коммит
41b5419572
|
@ -665,12 +665,9 @@ nsPop3Protocol::WaitForStartOfConnectionResponse(nsIInputStream* aInputStream,
|
|||
PRBool pauseForMoreData = PR_FALSE;
|
||||
line = m_lineStreamBuffer->ReadNextLine(aInputStream, line_length, pauseForMoreData);
|
||||
|
||||
if(line_length == 0)
|
||||
if(pauseForMoreData)
|
||||
{
|
||||
/* this shouldn't really happen, but...
|
||||
*/
|
||||
m_pop3ConData->next_state = m_pop3ConData->next_state_after_response;
|
||||
m_pop3ConData->pause_for_read = PR_FALSE; /* don't pause */
|
||||
m_pop3ConData->pause_for_read = PR_TRUE;
|
||||
return(0);
|
||||
}
|
||||
else if(line_length < 0)
|
||||
|
@ -706,11 +703,8 @@ nsPop3Protocol::WaitForResponse(nsIInputStream* inputStream, PRUint32 length)
|
|||
PRBool pauseForMoreData = PR_FALSE;
|
||||
line = m_lineStreamBuffer->ReadNextLine(inputStream, ln, pauseForMoreData);
|
||||
|
||||
if(ln == 0)
|
||||
if(pauseForMoreData)
|
||||
{
|
||||
/* this shouldn't really happen, but...
|
||||
*/
|
||||
// m_pop3ConData->next_state = m_pop3ConData->next_state_after_response;
|
||||
m_pop3ConData->pause_for_read = PR_TRUE; /* don't pause */
|
||||
return(0);
|
||||
}
|
||||
|
@ -839,12 +833,9 @@ nsPop3Protocol::AuthResponse(nsIInputStream* inputStream,
|
|||
PRBool pauseForMoreData = PR_FALSE;
|
||||
line = m_lineStreamBuffer->ReadNextLine(inputStream, ln, pauseForMoreData);
|
||||
|
||||
if(ln == 0)
|
||||
if(pauseForMoreData)
|
||||
{
|
||||
/* this shouldn't really happen, but...
|
||||
*/
|
||||
m_pop3ConData->next_state = m_pop3ConData->next_state_after_response;
|
||||
m_pop3ConData->pause_for_read = PR_FALSE; /* don't pause */
|
||||
m_pop3ConData->pause_for_read = PR_TRUE; /* don't pause */
|
||||
return(0);
|
||||
}
|
||||
else if (ln < 0)
|
||||
|
@ -1227,12 +1218,9 @@ nsPop3Protocol::GetList(nsIInputStream* inputStream,
|
|||
PRBool pauseForMoreData = PR_FALSE;
|
||||
line = m_lineStreamBuffer->ReadNextLine(inputStream, ln, pauseForMoreData);
|
||||
|
||||
if(ln== 0)
|
||||
if(pauseForMoreData)
|
||||
{
|
||||
/* this shouldn't really happen, but...
|
||||
*/
|
||||
m_pop3ConData->next_state = m_pop3ConData->next_state_after_response;
|
||||
m_pop3ConData->pause_for_read = PR_FALSE; /* don't pause */
|
||||
m_pop3ConData->pause_for_read = PR_TRUE;
|
||||
return(0);
|
||||
}
|
||||
else if(ln < 0)
|
||||
|
@ -1341,12 +1329,9 @@ nsPop3Protocol::GetFakeUidlTop(nsIInputStream* inputStream,
|
|||
PRBool pauseForMoreData = PR_FALSE;
|
||||
line = m_lineStreamBuffer->ReadNextLine(inputStream, ln, pauseForMoreData);
|
||||
|
||||
if(ln == 0)
|
||||
if(pauseForMoreData)
|
||||
{
|
||||
/* this shouldn't really happen, but...
|
||||
*/
|
||||
m_pop3ConData->next_state = m_pop3ConData->next_state_after_response;
|
||||
m_pop3ConData->pause_for_read = PR_FALSE; /* don't pause */
|
||||
m_pop3ConData->pause_for_read = PR_TRUE;
|
||||
return 0;
|
||||
}
|
||||
else if(ln < 0)
|
||||
|
@ -1515,12 +1500,9 @@ nsPop3Protocol::GetXtndXlstMsgid(nsIInputStream* inputStream,
|
|||
PRBool pauseForMoreData = PR_FALSE;
|
||||
line = m_lineStreamBuffer->ReadNextLine(inputStream, ln, pauseForMoreData);
|
||||
|
||||
if(ln == 0)
|
||||
if(pauseForMoreData)
|
||||
{
|
||||
/* this shouldn't really happen, but...
|
||||
*/
|
||||
m_pop3ConData->next_state = m_pop3ConData->next_state_after_response;
|
||||
m_pop3ConData->pause_for_read = PR_FALSE; /* don't pause */
|
||||
m_pop3ConData->pause_for_read = PR_TRUE;
|
||||
return 0;
|
||||
}
|
||||
else if(ln < 0)
|
||||
|
@ -1634,12 +1616,9 @@ nsPop3Protocol::GetUidlList(nsIInputStream* inputStream,
|
|||
PRBool pauseForMoreData = PR_FALSE;
|
||||
line = m_lineStreamBuffer->ReadNextLine(inputStream, ln, pauseForMoreData);
|
||||
|
||||
if(ln == 0)
|
||||
if(pauseForMoreData)
|
||||
{
|
||||
/* this shouldn't really happen, but...
|
||||
*/
|
||||
m_pop3ConData->next_state = m_pop3ConData->next_state_after_response;
|
||||
m_pop3ConData->pause_for_read = PR_FALSE; /* don't pause */
|
||||
m_pop3ConData->pause_for_read = PR_TRUE;
|
||||
return 0;
|
||||
}
|
||||
else if(ln < 0)
|
||||
|
|
Загрузка…
Ссылка в новой задаче