Skip to content

[automated] Merge branch 'release/3.1' => 'master' #16743

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
merged 9 commits into from
Nov 4, 2019
Merged

[automated] Merge branch 'release/3.1' => 'master' #16743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
def01cf
Pin NETStandard.Library.Ref (#16710)
mmitche Oct 31, 2019
ef442be
Remove flaky test (#15269) (#16717)
BrennanConroy Nov 1, 2019
da8f19a
[release/3.1] Update dependencies from aspnet/EntityFrameworkCore (#1…
dotnet-maestro[bot] Nov 1, 2019
cd09f74
Don't access CookieContainer unless needed (#16619)
BrennanConroy Nov 1, 2019
42c330d
[release/3.1] Update dependencies from aspnet/EntityFrameworkCore (#1…
dotnet-maestro[bot] Nov 1, 2019
58c4960
Update dependencies from https://github.com/aspnet/AspNetCore-Tooling…
dotnet-maestro[bot] Nov 1, 2019
a0dfffa
Merge pull request #16711 from mmitche/pin-netstandard-ref
wtgodbe Nov 1, 2019
7f015aa
Merge branch 'master' into merge/release/3.1-to-master
BrennanConroy Nov 1, 2019
4dfebe5
Mark `ConnectionNotClosedWhenClientSatisfiesMinimumDataRateGivenLarge…
dougbu Nov 4, 2019
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
3 changes: 2 additions & 1 deletion src/Servers/Kestrel/test/FunctionalTests/ResponseTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,8 @@ await connection.Send(
}
}

[Fact]
[ConditionalFact]
[Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2181", FlakyOn.All)]
public async Task ConnectionNotClosedWhenClientSatisfiesMinimumDataRateGivenLargeResponseChunks()
{
var chunkSize = 64 * 128 * 1024;
Expand Down
8 changes: 8 additions & 0 deletions src/SignalR/clients/csharp/Client/test/UnitTests/HttpConnectionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,14 @@ await WithConnectionAsync(
Assert.Same(httpOptions.Credentials, httpClientHandler.Credentials);
}

[Fact]
public void HttpOptionsCannotSetNullCookieContainer()
{
var httpOptions = new HttpConnectionOptions();
Assert.NotNull(httpOptions.Cookies);
Assert.Throws<ArgumentNullException>(() => httpOptions.Cookies = null);
}

[Fact]
public async Task HttpRequestAndErrorResponseLogged()
{
Expand Down
9 changes: 5 additions & 4 deletions src/SignalR/clients/csharp/Http.Connections.Client/src/HttpConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,13 +517,14 @@ private HttpClient CreateHttpClient()
{
httpClientHandler.Proxy = _httpConnectionOptions.Proxy;
}
if (_httpConnectionOptions.Cookies != null)

// Only access HttpClientHandler.ClientCertificates and HttpClientHandler.CookieContainer
// if the user has configured those options
// Some variants of Mono do not support client certs or cookies and will throw NotImplementedException
if (_httpConnectionOptions.Cookies.Count > 0)
{
httpClientHandler.CookieContainer = _httpConnectionOptions.Cookies;
}

// Only access HttpClientHandler.ClientCertificates if the user has configured client certs
// Mono does not support client certs and will throw NotImplementedException
// https://github.com/aspnet/SignalR/issues/2232
var clientCertificates = _httpConnectionOptions.ClientCertificates;
if (clientCertificates?.Count > 0)
Expand Down