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

Bug 1527890 - WebSocketChannel can hang waiting for OnTransportAvailable when HTTP request isn't upgraded, r=valentin

Browse Source 
Canceling mOpenTimer is moved to CallStartWebsocketData which is called after calling OnStartRequest as well as OnTransportAvailable.
This commit is contained in:
Michal Novotny
2019-02-14 06:22:00 +02:00
parent 54250e7625
commit 09e758289d
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2839,8 +2839,14 @@ nsresult WebSocketChannel::ApplyForAdmission() {
// Called after both OnStartRequest and OnTransportAvailable have
// executed. This essentially ends the handshake and starts the websockets
// protocol state machine.
nsresult WebSocketChannel::StartWebsocketData() {
nsresult rv;
nsresult WebSocketChannel::CallStartWebsocketData() {
LOG(("WebSocketChannel::CallStartWebsocketData() %p", this));
MOZ_ASSERT(NS_IsMainThread(), "not main thread");
if (mOpenTimer) {
mOpenTimer->Cancel();
mOpenTimer = nullptr;
}
if (!IsOnTargetThread()) {
return mTargetThread->Dispatch(
@@ -2849,6 +2855,12 @@ nsresult WebSocketChannel::StartWebsocketData() {
NS_DISPATCH_NORMAL);
}
return StartWebsocketData();
}
nsresult WebSocketChannel::StartWebsocketData() {
nsresult rv;
{
MutexAutoLock lock(mMutex);
LOG(("WebSocketChannel::StartWebsocketData() %p", this));
@@ -3165,7 +3177,6 @@ WebSocketChannel::Notify(nsITimer *timer) {
LOG(("WebSocketChannel:: Expecting Server Close - Timed Out\n"));
AbortSession(NS_ERROR_NET_TIMEOUT);
} else if (timer == mOpenTimer) {
MOZ_ASSERT(!mGotUpgradeOK, "Open Timer after open complete");
MOZ_ASSERT(NS_IsMainThread(), "not main thread");
mOpenTimer = nullptr;
@@ -3597,7 +3608,7 @@ WebSocketChannel::OnTransportAvailable(nsISocketTransport *aTransport,
// is pending
nsWSAdmissionManager::OnConnected(this);
return StartWebsocketData();
return CallStartWebsocketData();
}
if (mIsServerSide) {
@@ -3640,7 +3651,7 @@ WebSocketChannel::OnTransportAvailable(nsISocketTransport *aTransport,
}
}
return StartWebsocketData();
return CallStartWebsocketData();
}
return NS_OK;
@@ -3655,11 +3666,6 @@ WebSocketChannel::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext) {
MOZ_ASSERT(NS_IsMainThread(), "not main thread");
MOZ_ASSERT(!mGotUpgradeOK, "OTA duplicated");
if (mOpenTimer) {
mOpenTimer->Cancel();
mOpenTimer = nullptr;
}
if (mStopped) {
LOG(("WebSocketChannel::OnStartRequest: Channel Already Done\n"));
AbortSession(NS_ERROR_CONNECTION_REFUSED);
@@ -3832,7 +3838,7 @@ WebSocketChannel::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext) {
// is pending
nsWSAdmissionManager::OnConnected(this);
return StartWebsocketData();
return CallStartWebsocketData();
}
return NS_OK;
@@ -3845,6 +3851,13 @@ WebSocketChannel::OnStopRequest(nsIRequest *aRequest, nsISupports *aContext,
aRequest, mHttpChannel.get(), static_cast<uint32_t>(aStatusCode)));
MOZ_ASSERT(NS_IsMainThread(), "not main thread");
// OnTransportAvailable won't be called if the request is stopped with
// an error. Abort the session now instead of waiting for timeout.
if (NS_FAILED(aStatusCode) && !mRecvdHttpUpgradeTransport) {
AbortSession(aStatusCode);
return NS_OK;
}
ReportConnectionTelemetry();
// This is the end of the HTTP upgrade transaction, the