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

fixes bug 141779 "Trunk, M1RC1 Crashes related to DNS caching [@ nsDNSRequest::FireStop]"

Browse Source 
r=gordon sr=rpotts


git-svn-id: svn://10.0.0.236/trunk@121889 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
darin%netscape.com 2002-05-20 21:31:27 +00:00
parent 28264dd6a6
commit 3deecbd85f
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mozilla/netwerk/dns/src/nsDnsService.cpp
View File

@ -449,19 +449,23 @@ NS_IMETHODIMP
nsDNSRequest::Cancel(nsresult status)
{
NS_ASSERTION(NS_FAILED(status), "shouldn't cancel with a success code");
nsresult rv = NS_OK;
mStatus = status;
NS_ASSERTION(!PR_CLIST_IS_EMPTY(this), "request is not queue on lookup");
if (!PR_CLIST_IS_EMPTY(this)) {
nsDNSService::Lock();
PR_REMOVE_AND_INIT_LINK(this);
nsDNSService::Unlock();
}
if (mUserListener) rv = FireStop(status);
mLookup = nsnull;
return rv;
PRBool ignore = PR_FALSE;
nsDNSService::Lock();
if (PR_CLIST_IS_EMPTY(this)) {
// ignore this cancelation since we've already called OnStopLookup or
// are in the process of calling OnStopLookup (on a different thread).
ignore = PR_TRUE;
} else {
PR_REMOVE_AND_INIT_LINK(this);
ignore = (mUserListener == nsnull);
}
nsDNSService::Unlock();
if (ignore)
return NS_OK;
return FireStop(status);
}
NS_IMETHODIMP