Browser connections fail with "A server must not mask any frames that…

… it sends to the client" #213
chronoxor · Aug 12, 2022 · e2f8d14 · e2f8d14
1 parent 9013228
commit e2f8d14
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/source/NetCoreServer/NetCoreServer.csproj b/source/NetCoreServer/NetCoreServer.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>6.4.0.0</Version>
+    <Version>6.5.0.0</Version>
     <Authors>Ivan Shynkarenka</Authors>
     <Copyright>Copyright (c) 2019-2022 Ivan Shynkarenka</Copyright>
     <RepositoryUrl>https://github.com/chronoxor/NetCoreServer</RepositoryUrl>

diff --git a/source/NetCoreServer/WsSession.cs b/source/NetCoreServer/WsSession.cs
@@ -27,7 +27,7 @@ public long SendText(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_TEXT, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_TEXT, false, buffer);
                 return base.Send(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -40,7 +40,7 @@ public bool SendTextAsync(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_TEXT, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_TEXT, false, buffer);
                 return base.SendAsync(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -58,7 +58,7 @@ public long SendBinary(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_BINARY, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_BINARY, false, buffer);
                 return base.Send(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -71,7 +71,7 @@ public bool SendBinaryAsync(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_BINARY, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_BINARY, false, buffer);
                 return base.SendAsync(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -89,7 +89,7 @@ public long SendClose(int status, ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_CLOSE, true, buffer, status);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_CLOSE, false, buffer, status);
                 return base.Send(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -102,7 +102,7 @@ public bool SendCloseAsync(int status, ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_CLOSE, true, buffer, status);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_CLOSE, false, buffer, status);
                 return base.SendAsync(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -120,7 +120,7 @@ public long SendPing(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PING, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PING, false, buffer);
                 return base.Send(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -133,7 +133,7 @@ public bool SendPingAsync(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PING, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PING, false, buffer);
                 return base.SendAsync(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -151,7 +151,7 @@ public long SendPong(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PONG, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PONG, false, buffer);
                 return base.Send(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -164,7 +164,7 @@ public bool SendPongAsync(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PONG, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PONG, false, buffer);
                 return base.SendAsync(WebSocket.WsSendBuffer.AsSpan());
             }
         }

diff --git a/source/NetCoreServer/WssSession.cs b/source/NetCoreServer/WssSession.cs
@@ -27,7 +27,7 @@ public long SendText(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_TEXT, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_TEXT, false, buffer);
                 return base.Send(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -40,7 +40,7 @@ public bool SendTextAsync(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_TEXT, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_TEXT, false, buffer);
                 return base.SendAsync(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -58,7 +58,7 @@ public long SendBinary(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_BINARY, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_BINARY, false, buffer);
                 return base.Send(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -71,7 +71,7 @@ public bool SendBinaryAsync(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_BINARY, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_BINARY, false, buffer);
                 return base.SendAsync(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -89,7 +89,7 @@ public long SendClose(int status, ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_CLOSE, true, buffer, status);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_CLOSE, false, buffer, status);
                 return base.Send(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -102,7 +102,7 @@ public bool SendCloseAsync(int status, ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_CLOSE, true, buffer, status);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_CLOSE, false, buffer, status);
                 return base.SendAsync(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -120,7 +120,7 @@ public long SendPing(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PING, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PING, false, buffer);
                 return base.Send(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -133,7 +133,7 @@ public bool SendPingAsync(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PING, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PING, false, buffer);
                 return base.SendAsync(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -151,7 +151,7 @@ public long SendPong(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PONG, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PONG, false, buffer);
                 return base.Send(WebSocket.WsSendBuffer.AsSpan());
             }
         }
@@ -164,7 +164,7 @@ public bool SendPongAsync(ReadOnlySpan<byte> buffer)
         {
             lock (WebSocket.WsSendLock)
             {
-                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PONG, true, buffer);
+                WebSocket.PrepareSendFrame(WebSocket.WS_FIN | WebSocket.WS_PONG, false, buffer);
                 return base.SendAsync(WebSocket.WsSendBuffer.AsSpan());
             }
         }

diff --git a/tests/tests.csproj b/tests/tests.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>