Support multi-buffer sends in WebAssembly WebSockets

Proposed fix for dotnet#44551
BrennanConroy · Nov 12, 2020 · d9a5e01 · d9a5e01
1 parent 1923bba
commit d9a5e01
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/...tem.Net.WebSockets.Client/src/System/Net/WebSockets/BrowserWebSockets/BrowserWebSocket.cs b/...tem.Net.WebSockets.Client/src/System/Net/WebSockets/BrowserWebSockets/BrowserWebSocket.cs
@@ -357,14 +357,21 @@ public override Task SendAsync(ArraySegment<byte> buffer, WebSocketMessageType m
 
             WebSocketValidate.ValidateArraySegment(buffer, nameof(buffer));
 
-            _writeBuffer ??= new MemoryStream();
-            _writeBuffer.Write(buffer.Array!, buffer.Offset, buffer.Count);
-
             if (!endOfMessage)
+            {
+                _writeBuffer ??= new MemoryStream();
+                _writeBuffer.Write(buffer.Array!, buffer.Offset, buffer.Count);
                 return Task.CompletedTask;
+            }
 
             MemoryStream writtenBuffer = _writeBuffer;
             _writeBuffer = null;
+
+            if (writtenBuffer is not null)
+            {
+                writtenBuffer.Write(buffer.Array!, buffer.Offset, buffer.Count);
+            }
+            buffer = writtenBuffer?.ToArray() ?? buffer;
 
             try
             {