Skip to content

Replace Enum.HasFlag with bitwise operations in WebSockets #127137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rzikm merged 1 commit into from
Apr 20, 2026
Merged

Replace Enum.HasFlag with bitwise operations in WebSockets #127137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/libraries/System.Net.WebSockets/src/System/Net/WebSockets/ManagedWebSocket.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,8 +324,8 @@ public override ValueTask SendAsync(ReadOnlyMemory<byte> buffer, WebSocketMessag
return ValueTask.FromException(exc);
}

bool endOfMessage = messageFlags.HasFlag(WebSocketMessageFlags.EndOfMessage);
bool disableCompression = messageFlags.HasFlag(WebSocketMessageFlags.DisableCompression);
bool endOfMessage = (messageFlags & WebSocketMessageFlags.EndOfMessage) != 0;
bool disableCompression = (messageFlags & WebSocketMessageFlags.DisableCompression) != 0;
MessageOpcode opcode;

if (_lastSendWasFragment)
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Net.WebSockets/src/System/Net/WebSockets/WebSocket.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public virtual ValueTask SendAsync(ReadOnlyMemory<byte> buffer, WebSocketMessage

public virtual ValueTask SendAsync(ReadOnlyMemory<byte> buffer, WebSocketMessageType messageType, WebSocketMessageFlags messageFlags, CancellationToken cancellationToken = default)
{
return SendAsync(buffer, messageType, messageFlags.HasFlag(WebSocketMessageFlags.EndOfMessage), cancellationToken);
return SendAsync(buffer, messageType, (messageFlags & WebSocketMessageFlags.EndOfMessage) != 0, cancellationToken);
}

private async ValueTask SendWithArrayPoolAsync(
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Net.WebSockets/src/System/Net/WebSockets/WebSocketStateHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ internal static class WebSocketStateHelper
/// <summary>Valid states to be in when calling CloseAsync.</summary>
internal const ManagedWebSocketStates ValidCloseStates = ManagedWebSocketStates.Open | ManagedWebSocketStates.CloseReceived | ManagedWebSocketStates.CloseSent;

internal static bool IsValidSendState(WebSocketState state) => ValidSendStates.HasFlag(ToFlag(state));
internal static bool IsValidSendState(WebSocketState state) => (ValidSendStates & ToFlag(state)) != 0;

internal static void ThrowIfInvalidState(WebSocketState currentState, bool isDisposed, Exception? innerException, ManagedWebSocketStates validStates)
{
Expand Down
Loading