Fix Bug: .NetFramework 4.8 ClientWebSocket Cann't Connect To .Net8 Ws…

…Session chronoxor#278
lukebakken · Feb 8, 2024 · b4da3b9 · b4da3b9
1 parent e62916c
commit b4da3b9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/source/NetCoreServer/NetCoreServer.csproj b/source/NetCoreServer/NetCoreServer.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
-    <Version>8.0.5.0</Version>
+    <Version>8.0.6.0</Version>
     <Authors>Ivan Shynkarenka</Authors>
     <Copyright>Copyright (c) 2019-2023 Ivan Shynkarenka</Copyright>
     <RepositoryUrl>https://github.com/chronoxor/NetCoreServer</RepositoryUrl>

diff --git a/source/NetCoreServer/WebSocket.cs b/source/NetCoreServer/WebSocket.cs
@@ -159,14 +159,7 @@ public bool PerformServerUpgrade(HttpRequest request, HttpResponse response)
 
                 if (string.Compare(key, "Connection", StringComparison.OrdinalIgnoreCase) == 0)
                 {
-                    var values = value.Split(',').Select(str => str.Trim()).ToArray();
-                    if ((values.Length == 0) ||
-                        ((values.Length == 1) && (string.Compare(values[0], "Upgrade", StringComparison.OrdinalIgnoreCase) != 0)) ||
-                        ((values.Length == 2) && !(
-                            ((string.Compare(values[0], "Upgrade", StringComparison.OrdinalIgnoreCase) == 0) && (string.Compare(values[1], "keep-alive", StringComparison.OrdinalIgnoreCase) == 0)) ||
-                            ((string.Compare(values[0], "keep-alive", StringComparison.OrdinalIgnoreCase) == 0) && (string.Compare(values[1], "Upgrade", StringComparison.OrdinalIgnoreCase) == 0))
-                        )) ||
-                        (values.Length > 2))
+                    if ((string.Compare(value, "Upgrade", StringComparison.OrdinalIgnoreCase) != 0) && (string.Compare(value.RemoveWhiteSpace(), "keep-alive,Upgrade", StringComparison.OrdinalIgnoreCase) != 0))
                     {
                         error = true;
                         response.MakeErrorResponse(400, "Invalid WebSocket handshaked request: 'Connection' header value must be 'Upgrade' or 'Upgrade, keep-alive'");