зеркало из https://github.com/mozilla/gecko-dev.git
Bug #30102 --> don't logoff the external login requestor
if we succeeded in the request...we want to cache the requestor for the session. r=amusil a=daver
This commit is contained in:
Родитель
c60a73cc5a
Коммит
a6d6fc0f6a
|
@ -1629,10 +1629,9 @@ NS_IMETHODIMP nsSmtpProtocol::OnLogonRedirectionReply(const PRUnichar * aHost, u
|
|||
NS_ENSURE_TRUE(smtpServer, NS_ERROR_FAILURE);
|
||||
NS_ENSURE_TRUE(m_logonRedirector, NS_ERROR_FAILURE);
|
||||
|
||||
// logoff
|
||||
nsXPIDLCString userName;
|
||||
smtpServer->GetUsername(getter_Copies(userName));
|
||||
m_logonRedirector->Logoff(userName);
|
||||
// we used to logoff from the requestor but we don't want to do
|
||||
// that anymore in the success case. We want to end up caching the
|
||||
// external connection for the entire session.
|
||||
m_logonRedirector = nsnull; // we don't care about it anymore
|
||||
|
||||
// remember the logon cookie
|
||||
|
|
|
@ -1228,7 +1228,7 @@ nsImapIncomingServer::FEAlert(const PRUnichar* aString)
|
|||
nsresult rv;
|
||||
NS_WITH_SERVICE(nsIPrompt, dialog, kNetSupportDialogCID, &rv);
|
||||
|
||||
rv = dialog->Alert(nsAutoString(aString).GetUnicode());
|
||||
rv = dialog->Alert(aString);
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
@ -1684,14 +1684,8 @@ NS_IMETHODIMP nsImapIncomingServer::OnLogonRedirectionReply(const PRUnichar *pHo
|
|||
if (NS_SUCCEEDED(rv) && pEventQService)
|
||||
pEventQService->GetThreadEventQueue(NS_CURRENT_THREAD,
|
||||
getter_AddRefs(aEventQueue));
|
||||
// logoff so some one else can use the connection.
|
||||
if (m_logonRedirector)
|
||||
{
|
||||
nsXPIDLCString userName;
|
||||
|
||||
GetUsername(getter_Copies(userName));
|
||||
m_logonRedirector->Logoff(userName);
|
||||
}
|
||||
// we used to logoff the external requestor...we no longer need to do
|
||||
// that.
|
||||
|
||||
m_redirectedLogonRetries = 0; // we got through, so reset this counter.
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче