From f7acbd681641e77b4fb3d4e9e009179f3af39dca Mon Sep 17 00:00:00 2001
From: Andrew Stanton-Nurse <andrew@andrewnurse.net>
Date: Thu, 1 Sep 2016 10:35:56 -0700
Subject: [PATCH] fix #11309 in WebSockets by throwing when the underlying
 connection is closed

---
 .../src/System/Net/WebSockets/ManagedWebSocket.cs          | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/ManagedWebSocket.cs b/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/ManagedWebSocket.cs
index d537e1b92aa0..8f0877ed64a3 100644
--- a/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/ManagedWebSocket.cs
+++ b/src/System.Net.WebSockets.Client/src/System/Net/WebSockets/ManagedWebSocket.cs
@@ -615,12 +615,7 @@ private async Task<WebSocketReceiveResult> ReceiveAsyncPrivate(ArraySegment<byte
                             // Make sure we have the first two bytes, which includes the start of the payload length.
                             if (_receiveBufferCount < 2)
                             {
-                                await EnsureBufferContainsAsync(2, cancellationToken, throwOnPrematureClosure: false).ConfigureAwait(false);
-                                if (_receiveBufferCount < 2)
-                                {
-                                    // The connection closed; nothing more to read.
-                                    return new WebSocketReceiveResult(0, WebSocketMessageType.Text, true);
-                                }
+                                await EnsureBufferContainsAsync(2, cancellationToken, throwOnPrematureClosure: true).ConfigureAwait(false);
                             }
 
                             // Then make sure we have the full header based on the payload length.