huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Suppress web socket closing without handshake

This commit is contained in:
James Newton-King 2018-04-15 17:51:31 +12:00
parent a13f3f4765
commit c835288e84
No known key found for this signature in database
GPG Key ID: 0A66B2F456BF5526
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Microsoft.AspNetCore.Http.Connections/Internal/Transports/WebSocketsTransport.cs
View File

@ -143,7 +143,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal.Transports
while (true) while (true)
{ {
#if NETCOREAPP2_1 #if NETCOREAPP2_1
// Do a 0 byte read so that idle connections don't allocate a buffer when waiting for a read // Do a 0 byte read so that idle connections don't allocate a buffer when waiting for a read
var result = await socket.ReceiveAsync(Memory<byte>.Empty, CancellationToken.None); var result = await socket.ReceiveAsync(Memory<byte>.Empty, CancellationToken.None);
if (result.MessageType == WebSocketMessageType.Close) if (result.MessageType == WebSocketMessageType.Close)
@ -154,7 +154,7 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal.Transports
var memory = _application.Output.GetMemory(); var memory = _application.Output.GetMemory();
#if NETCOREAPP2_1 #if NETCOREAPP2_1
// Because we checked the CloseStatus from the 0 byte read above, we don't need to check again after reading // Because we checked the CloseStatus from the 0 byte read above, we don't need to check again after reading
var receiveResult = await socket.ReceiveAsync(memory, CancellationToken.None); var receiveResult = await socket.ReceiveAsync(memory, CancellationToken.None);
#else #else
var isArray = MemoryMarshal.TryGetArray<byte>(memory, out var arraySegment); var isArray = MemoryMarshal.TryGetArray<byte>(memory, out var arraySegment);
@ -182,6 +182,11 @@ namespace Microsoft.AspNetCore.Http.Connections.Internal.Transports
} }
} }
} }
catch (WebSocketException ex) when (ex.ErrorCode == 997)
{
// The remote party closed the WebSocket connection without completing the close handshake
// Don't long an error for this exception
}
catch (OperationCanceledException) catch (OperationCanceledException)
{ {
// Ignore aborts, don't treat them like transport errors // Ignore aborts, don't treat them like transport errors