forked from mirrors/gecko-dev
Bug 1861885 - set nsHttpChannel::mAuthRetryPending false for failed requests. r=necko-reviewers,kershaw
Differential Revision: https://phabricator.services.mozilla.com/D192168
This commit is contained in:
parent
3f683792a0
commit
a085e78665
1 changed files with 14 additions and 8 deletions
|
|
@ -7828,13 +7828,16 @@ nsresult nsHttpChannel::ContinueOnStopRequestAfterAuthRetry(
|
|||
if (mListener) {
|
||||
MOZ_ASSERT(!LoadOnStartRequestCalled(),
|
||||
"We should not call OnStartRequest twice.");
|
||||
nsCOMPtr<nsIStreamListener> listener(mListener);
|
||||
StoreOnStartRequestCalled(true);
|
||||
listener->OnStartRequest(this);
|
||||
if (!LoadOnStartRequestCalled()) {
|
||||
nsCOMPtr<nsIStreamListener> listener(mListener);
|
||||
StoreOnStartRequestCalled(true);
|
||||
listener->OnStartRequest(this);
|
||||
}
|
||||
} else {
|
||||
StoreOnStartRequestCalled(true);
|
||||
NS_WARNING("OnStartRequest skipped because of null listener");
|
||||
}
|
||||
mAuthRetryPending = false;
|
||||
}
|
||||
|
||||
// if this transaction has been replaced, then bail.
|
||||
|
|
@ -8120,17 +8123,18 @@ nsresult nsHttpChannel::ContinueOnStopRequest(nsresult aStatus, bool aIsFromNet,
|
|||
if (mListener) {
|
||||
MOZ_ASSERT(!LoadOnStartRequestCalled(),
|
||||
"We should not call OnStartRequest twice.");
|
||||
nsCOMPtr<nsIStreamListener> listener(mListener);
|
||||
StoreOnStartRequestCalled(true);
|
||||
listener->OnStartRequest(this);
|
||||
if (!LoadOnStartRequestCalled()) {
|
||||
nsCOMPtr<nsIStreamListener> listener(mListener);
|
||||
StoreOnStartRequestCalled(true);
|
||||
listener->OnStartRequest(this);
|
||||
}
|
||||
} else {
|
||||
StoreOnStartRequestCalled(true);
|
||||
NS_WARNING("OnStartRequest skipped because of null listener");
|
||||
}
|
||||
}
|
||||
mRedirectChannel = nullptr;
|
||||
mAuthRetryPending = false;
|
||||
}
|
||||
|
||||
if (mListener) {
|
||||
LOG(("nsHttpChannel %p calling OnStopRequest\n", this));
|
||||
MOZ_ASSERT(LoadOnStartRequestCalled(),
|
||||
|
|
@ -8147,6 +8151,8 @@ nsresult nsHttpChannel::ContinueOnStopRequest(nsresult aStatus, bool aIsFromNet,
|
|||
|
||||
mTransactionSticky = nullptr;
|
||||
|
||||
mRedirectChannel = nullptr;
|
||||
|
||||
// notify "http-on-stop-connect" observers
|
||||
gHttpHandler->OnStopRequest(this);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue