From 5d337fbd9d43d54a7e4c5a79375da35939516b95 Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Wed, 17 Oct 2018 12:46:35 -0700
Subject: [PATCH] Revert "Set default protocol to HTTP/1.x"

This reverts commit 97acb95715f894de638974d4cc32dcc7f30e1ebf.
---
 src/Kestrel.Core/ListenOptions.cs                      | 4 ++--
 test/Kestrel.Core.Tests/ListenOptionsTests.cs          | 2 +-
 test/Kestrel.Tests/KestrelConfigurationBuilderTests.cs | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Kestrel.Core/ListenOptions.cs b/src/Kestrel.Core/ListenOptions.cs
index 25ec105c32..b3e4ec21ce 100644
--- a/src/Kestrel.Core/ListenOptions.cs
+++ b/src/Kestrel.Core/ListenOptions.cs
@@ -126,8 +126,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core
         /// <summary>
         /// The protocols enabled on this endpoint.
         /// </summary>
-        /// <remarks>Defaults to HTTP/1.x.</remarks>
-        public HttpProtocols Protocols { get; set; } = HttpProtocols.Http1;
+        /// <remarks>Defaults to HTTP/1.x and HTTP/2.</remarks>
+        public HttpProtocols Protocols { get; set; } = HttpProtocols.Http1AndHttp2;
 
         /// <summary>
         /// Gets the <see cref="List{IConnectionAdapter}"/> that allows each connection <see cref="System.IO.Stream"/>
diff --git a/test/Kestrel.Core.Tests/ListenOptionsTests.cs b/test/Kestrel.Core.Tests/ListenOptionsTests.cs
index b915dcd3a0..998d0a34a4 100644
--- a/test/Kestrel.Core.Tests/ListenOptionsTests.cs
+++ b/test/Kestrel.Core.Tests/ListenOptionsTests.cs
@@ -15,7 +15,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
         public void ProtocolsDefault()
         {
             var listenOptions = new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0));
-            Assert.Equal(HttpProtocols.Http1, listenOptions.Protocols);
+            Assert.Equal(HttpProtocols.Http1AndHttp2, listenOptions.Protocols);
         }
 
         [Fact]
diff --git a/test/Kestrel.Tests/KestrelConfigurationBuilderTests.cs b/test/Kestrel.Tests/KestrelConfigurationBuilderTests.cs
index d763b0dd64..96f6f8777f 100644
--- a/test/Kestrel.Tests/KestrelConfigurationBuilderTests.cs
+++ b/test/Kestrel.Tests/KestrelConfigurationBuilderTests.cs
@@ -385,7 +385,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Tests
             serverOptions.ConfigureEndpointDefaults(opt =>
             {
                 // Kestrel default.
-                Assert.Equal(HttpProtocols.Http1, opt.Protocols);
+                Assert.Equal(HttpProtocols.Http1AndHttp2, opt.Protocols);
                 ranDefault = true;
             });
 
@@ -415,14 +415,14 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Tests
                 .LocalhostEndpoint(5002, opt =>
                 {
                     // Kestrel default.
-                    Assert.Equal(HttpProtocols.Http1, opt.Protocols);
+                    Assert.Equal(HttpProtocols.Http1AndHttp2, opt.Protocols);
                     ran2 = true;
                 })
                 .Load();
             serverOptions.ListenAnyIP(0, opt =>
             {
                 // Kestrel default.
-                Assert.Equal(HttpProtocols.Http1, opt.Protocols);
+                Assert.Equal(HttpProtocols.Http1AndHttp2, opt.Protocols);
                 ran3 = true;
             });