Bug 1360332 - Part 1: avoid calling FailDiversion() twice; r?dragana
MozReview-Commit-ID: DxI3c3223hJ
--- a/netwerk/protocol/http/HttpChannelParent.cpp
+++ b/netwerk/protocol/http/HttpChannelParent.cpp
@@ -1917,24 +1917,22 @@ HttpChannelParent::ResumeForDiversion()
}
mChannel->MessageDiversionStop();
if (mSuspendedForDiversion) {
// The nsHttpChannel will deliver remaining OnData/OnStop for the transfer.
nsresult rv = mChannel->ResumeInternal();
if (NS_WARN_IF(NS_FAILED(rv))) {
- FailDiversion(NS_ERROR_UNEXPECTED, true);
return rv;
}
mSuspendedForDiversion = false;
}
if (NS_WARN_IF(mIPCClosed || !DoSendDeleteSelf())) {
- FailDiversion(NS_ERROR_UNEXPECTED);
return NS_ERROR_UNEXPECTED;
}
return NS_OK;
}
void
HttpChannelParent::DivertTo(nsIStreamListener *aListener)
{