reopened pr ThreeMammals#1030

OnSive · May 9, 2022 · 5fc24cb · 5fc24cb
1 parent 36ad6e1
commit 5fc24cb
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/Ocelot/WebSockets/Middleware/WebSocketsProxyMiddleware.cs b/src/Ocelot/WebSockets/Middleware/WebSocketsProxyMiddleware.cs
@@ -46,13 +46,21 @@ private static async Task PumpWebSocket(WebSocket source, WebSocket destination,
                 catch (OperationCanceledException)
                 {
                     await destination.CloseOutputAsync(WebSocketCloseStatus.EndpointUnavailable, null, cancellationToken);
+                    if (destination.State == WebSocketState.Open || destination.State == WebSocketState.CloseReceived)
+                    {
+                        await destination.CloseOutputAsync(WebSocketCloseStatus.EndpointUnavailable, null, cancellationToken);
+                    }
                     return;
                 }
                 catch (WebSocketException e)
                 {
                     if (e.WebSocketErrorCode == WebSocketError.ConnectionClosedPrematurely)
                     {
                         await destination.CloseOutputAsync(WebSocketCloseStatus.EndpointUnavailable, null, cancellationToken);
+                        if (destination.State == WebSocketState.Open || destination.State == WebSocketState.CloseReceived)
+                        {
+                            await destination.CloseOutputAsync(WebSocketCloseStatus.EndpointUnavailable, null, cancellationToken);
+                        }
                         return;
                     }
                     throw;