Move all of it into HttpProtocol

Author: davidfowl

src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs

@@ -63,6 +63,7 @@ public abstract partial class HttpProtocol : IHttpResponseControl
         private long _responseBytesWritten;
 
         private readonly HttpConnectionContext _context;
+        private DefaultHttpContext _httpContext;
 
         protected string _methodText = null;
         private string _scheme = null;
@@ -98,9 +99,6 @@ public HttpProtocol(HttpConnectionContext context)
         public long? MaxRequestBodySize { get; set; }
         public bool AllowSynchronousIO { get; set; }
 
-        // Caches the HttpContext allocation
-        internal DefaultHttpContext HttpContext { get; set; }
-
         /// <summary>
         /// The request id. <seealso cref="HttpContext.TraceIdentifier"/>
         /// </summary>
@@ -278,6 +276,20 @@ public CancellationToken RequestAborted
 
         protected HttpResponseHeaders HttpResponseHeaders { get; } = new HttpResponseHeaders();
 
+        internal HttpContext InitializeHttpContext()
+        {
+            if (_httpContext is null)
+            {
+                _httpContext = new DefaultHttpContext(this);
+            }
+            else
+            {
+                _httpContext.Initialize(this);
+            }
+
+            return _httpContext;
+        }
+
         public void InitializeStreams(MessageBody messageBody)
         {
             if (_streams == null)
@@ -362,7 +374,7 @@ public void Reset()
 
             _responseBytesWritten = 0;
 
-            HttpContext?.Uninitialize();
+            _httpContext?.Uninitialize();
 
             OnReset();
         }

src/Servers/Kestrel/Core/src/Internal/KestrelHttpContextFactory.cs

@@ -24,18 +24,7 @@ protected override HttpContext CreateHttpContext(IFeatureCollection featureColle
         {
             if (featureCollection is HttpProtocol protocol)
             {
-                // First request, the HttpContext is null, so make a new one
-                if (protocol.HttpContext == null)
-                {
-                    protocol.HttpContext = new DefaultHttpContext(featureCollection);
-                }
-                else
-                {
-                    // Otherwise just initialize the feature collection on the existing connection
-                    protocol.HttpContext.Initialize(featureCollection);
-                }
-
-                return protocol.HttpContext;
+                return protocol.InitializeHttpContext();
             }
 
             // Since Kestrel is registered by default, we need to fallback to the default behavior