huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Set default protocol to HTTP/1.x" 

This reverts commit 97acb95715.
This commit is contained in:
John Luo 2018-10-17 12:46:35 -07:00
parent e364177c5f
commit 5d337fbd9d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Kestrel.Core/ListenOptions.cs
View File

@ -126,8 +126,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core
/// <summary> /// <summary>
/// The protocols enabled on this endpoint. /// The protocols enabled on this endpoint.
/// </summary> /// </summary>
/// <remarks>Defaults to HTTP/1.x.</remarks> /// <remarks>Defaults to HTTP/1.x and HTTP/2.</remarks>
public HttpProtocols Protocols { get; set; } = HttpProtocols.Http1; public HttpProtocols Protocols { get; set; } = HttpProtocols.Http1AndHttp2;
/// <summary> /// <summary>
/// Gets the <see cref="List{IConnectionAdapter}"/> that allows each connection <see cref="System.IO.Stream"/> /// Gets the <see cref="List{IConnectionAdapter}"/> that allows each connection <see cref="System.IO.Stream"/>

2
test/Kestrel.Core.Tests/ListenOptionsTests.cs
View File

@ -15,7 +15,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
public void ProtocolsDefault() public void ProtocolsDefault()
{ {
var listenOptions = new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0)); var listenOptions = new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0));
Assert.Equal(HttpProtocols.Http1, listenOptions.Protocols); Assert.Equal(HttpProtocols.Http1AndHttp2, listenOptions.Protocols);
} }
[Fact] [Fact]

6
test/Kestrel.Tests/KestrelConfigurationBuilderTests.cs
View File

@ -385,7 +385,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Tests
serverOptions.ConfigureEndpointDefaults(opt => serverOptions.ConfigureEndpointDefaults(opt =>
{ {
// Kestrel default. // Kestrel default.
Assert.Equal(HttpProtocols.Http1, opt.Protocols); Assert.Equal(HttpProtocols.Http1AndHttp2, opt.Protocols);
ranDefault = true; ranDefault = true;
}); });
@ -415,14 +415,14 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Tests
.LocalhostEndpoint(5002, opt => .LocalhostEndpoint(5002, opt =>
{ {
// Kestrel default. // Kestrel default.
Assert.Equal(HttpProtocols.Http1, opt.Protocols); Assert.Equal(HttpProtocols.Http1AndHttp2, opt.Protocols);
ran2 = true; ran2 = true;
}) })
.Load(); .Load();
serverOptions.ListenAnyIP(0, opt => serverOptions.ListenAnyIP(0, opt =>
{ {
// Kestrel default. // Kestrel default.
Assert.Equal(HttpProtocols.Http1, opt.Protocols); Assert.Equal(HttpProtocols.Http1AndHttp2, opt.Protocols);
ran3 = true; ran3 = true;
}); });