зеркало из https://github.com/mozilla/gecko-dev.git
potential fix for deadlock when network connection goes down with imap connections, sr=mscott 312775
This commit is contained in:
Родитель
65296d9d03
Коммит
bbe8962d8e
|
@ -657,7 +657,6 @@ nsImapIncomingServer::ConnectionTimeOut(nsIImapProtocol* aConnection)
|
|||
if (!aConnection) return retVal;
|
||||
nsresult rv;
|
||||
|
||||
PR_CEnterMonitor(this);
|
||||
PRInt32 timeoutInMinutes = 0;
|
||||
rv = GetTimeOutLimits(&timeoutInMinutes);
|
||||
if (NS_FAILED(rv) || timeoutInMinutes <= 0 || timeoutInMinutes > 29)
|
||||
|
@ -683,12 +682,11 @@ nsImapIncomingServer::ConnectionTimeOut(nsIImapProtocol* aConnection)
|
|||
&rv));
|
||||
if (NS_SUCCEEDED(rv) && aProtocol)
|
||||
{
|
||||
m_connectionCache->RemoveElement(aConnection);
|
||||
RemoveConnection(aConnection);
|
||||
aProtocol->TellThreadToDie(PR_FALSE);
|
||||
retVal = PR_TRUE;
|
||||
}
|
||||
}
|
||||
PR_CExitMonitor(this);
|
||||
return retVal;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче