Skip to content

[release/7.0] Fix compression #79547

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
carlossanlop merged 6 commits into from
Jan 5, 2023
Merged

[release/7.0] Fix compression #79547

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d66537c
Fix compression
Dec 8, 2022
84d3b4a
Apply suggestions from code review
Dec 9, 2022
12033d4
Adding SendAsync to ref
Dec 9, 2022
39d4d4a
fix ws deflate tests
Dec 9, 2022
e3608f6
Check bytes on server side
CarnaViire Dec 12, 2022
04b9174
Remove ref assembly change, pr feedback
CarnaViire Jan 4, 2023
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
Prev Previous commit
Remove ref assembly change, pr feedback
  • Loading branch information
@CarnaViire
CarnaViire committed Jan 4, 2023
commit 04b917419553fe4793f298dc2e15e103d16ef75c
1 change: 0 additions & 1 deletion src/libraries/System.Net.WebSockets.Client/ref/System.Net.WebSockets.Client.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ public override void Dispose() { }
public override System.Threading.Tasks.ValueTask<System.Net.WebSockets.ValueWebSocketReceiveResult> ReceiveAsync(System.Memory<byte> buffer, System.Threading.CancellationToken cancellationToken) { throw null; }
public override System.Threading.Tasks.Task SendAsync(System.ArraySegment<byte> buffer, System.Net.WebSockets.WebSocketMessageType messageType, bool endOfMessage, System.Threading.CancellationToken cancellationToken) { throw null; }
public override System.Threading.Tasks.ValueTask SendAsync(System.ReadOnlyMemory<byte> buffer, System.Net.WebSockets.WebSocketMessageType messageType, bool endOfMessage, System.Threading.CancellationToken cancellationToken) { throw null; }
public override System.Threading.Tasks.ValueTask SendAsync(System.ReadOnlyMemory<byte> buffer, System.Net.WebSockets.WebSocketMessageType messageType, System.Net.WebSockets.WebSocketMessageFlags messageFlags, System.Threading.CancellationToken cancellationToken) { throw null; }
}
public sealed partial class ClientWebSocketOptions
{
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Net.WebSockets.Client/tests/DeflateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ await LoopbackServer.CreateClientAndServerAsync(async uri =>
cws.SendAsync(Memory<byte>.Empty, WebSocketMessageType.Binary, WebSocketMessageFlags.EndOfMessage, default));
}, server => server.AcceptConnectionAsync(async connection =>
{
var extensionsReply = CreateDeflateOptionsHeader(deflateOpt);
string extensionsReply = CreateDeflateOptionsHeader(deflateOpt);
await LoopbackHelper.WebSocketHandshakeAsync(connection, extensionsReply);
}), new LoopbackServer.Options { WebSocketEndpoint = true });
}
Expand Down Expand Up @@ -150,7 +150,7 @@ await LoopbackServer.CreateClientAndServerAsync(async uri =>
}, server => server.AcceptConnectionAsync(async connection =>
{
var buffer = new byte[compressedRemainingBytes];
var extensionsReply = CreateDeflateOptionsHeader(deflateOpt);
string extensionsReply = CreateDeflateOptionsHeader(deflateOpt);
await LoopbackHelper.WebSocketHandshakeAsync(connection, extensionsReply);

// first message is compressed
Expand Down