corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1179255 - (fatal) Assertion failure: aRequest == mCancelable, at netwerk/protocol/websocket/WebSocketChannel.cpp:2766, r=mcmanus

Browse Source
This commit is contained in:
Michal Novotny
2015-08-11 14:50:08 +02:00
parent bea00a2ff2
commit 4160865baf
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
netwerk/protocol/websocket/WebSocketChannel.cpp
View File

@@ -2704,10 +2704,15 @@ WebSocketChannel::ApplyForAdmission()
MOZ_ASSERT(!mCancelable);
return pps->AsyncResolve(mHttpChannel,
nsIProtocolProxyService::RESOLVE_PREFER_HTTPS_PROXY |
nsIProtocolProxyService::RESOLVE_ALWAYS_TUNNEL,
this, getter_AddRefs(mCancelable));
nsresult rv;
rv = pps->AsyncResolve(mHttpChannel,
nsIProtocolProxyService::RESOLVE_PREFER_HTTPS_PROXY |
nsIProtocolProxyService::RESOLVE_ALWAYS_TUNNEL,
this, getter_AddRefs(mCancelable));
NS_ASSERTION(NS_FAILED(rv) || mCancelable,
"nsIProtocolProxyService::AsyncResolve succeeded but didn't "
"return a cancelable object!");
return rv;
}
// Called after both OnStartRequest and OnTransportAvailable have
@@ -2855,7 +2860,7 @@ WebSocketChannel::OnProxyAvailable(nsICancelable *aRequest, nsIChannel *aChannel
return NS_OK;
}
MOZ_ASSERT(aRequest == mCancelable);
MOZ_ASSERT(!mCancelable || (aRequest == mCancelable));
mCancelable = nullptr;
nsAutoCString type;