Skip to content

Commit fcbbcb7

Browse files
committed
Fix Bug: .NetFramework 4.8 ClientWebSocket Cann't Connect To .Net8 WsSession #278
1 parent 03a81a2 commit fcbbcb7

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

source/NetCoreServer/NetCoreServer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
5-
<Version>8.0.5.0</Version>
5+
<Version>8.0.6.0</Version>
66
<Authors>Ivan Shynkarenka</Authors>
77
<Copyright>Copyright (c) 2019-2023 Ivan Shynkarenka</Copyright>
88
<RepositoryUrl>https://github.com/chronoxor/NetCoreServer</RepositoryUrl>

source/NetCoreServer/WebSocket.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -159,14 +159,7 @@ public bool PerformServerUpgrade(HttpRequest request, HttpResponse response)
159159

160160
if (string.Compare(key, "Connection", StringComparison.OrdinalIgnoreCase) == 0)
161161
{
162-
var values = value.Split(',').Select(str => str.Trim()).ToArray();
163-
if ((values.Length == 0) ||
164-
((values.Length == 1) && (string.Compare(values[0], "Upgrade", StringComparison.OrdinalIgnoreCase) != 0)) ||
165-
((values.Length == 2) && !(
166-
((string.Compare(values[0], "Upgrade", StringComparison.OrdinalIgnoreCase) == 0) && (string.Compare(values[1], "keep-alive", StringComparison.OrdinalIgnoreCase) == 0)) ||
167-
((string.Compare(values[0], "keep-alive", StringComparison.OrdinalIgnoreCase) == 0) && (string.Compare(values[1], "Upgrade", StringComparison.OrdinalIgnoreCase) == 0))
168-
)) ||
169-
(values.Length > 2))
162+
if ((string.Compare(value, "Upgrade", StringComparison.OrdinalIgnoreCase) != 0) && (string.Compare(value.RemoveWhiteSpace(), "keep-alive,Upgrade", StringComparison.OrdinalIgnoreCase) != 0))
170163
{
171164
error = true;
172165
response.MakeErrorResponse(400, "Invalid WebSocket handshaked request: 'Connection' header value must be 'Upgrade' or 'Upgrade, keep-alive'");

0 commit comments

Comments
 (0)