PR feedback and fixes

Author: davidfowl

src/Servers/HttpSys/HttpSysServer.slnf

@@ -23,7 +23,8 @@
       "src\\Servers\\HttpSys\\src\\Microsoft.AspNetCore.Server.HttpSys.csproj",
       "src\\Servers\\HttpSys\\test\\FunctionalTests\\Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj",
       "src\\Servers\\HttpSys\\test\\Tests\\Microsoft.AspNetCore.Server.HttpSys.Tests.csproj",
-      "src\\Servers\\Kestrel\\Transport.Sockets\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj"
+      "src\\Servers\\Kestrel\\Transport.Sockets\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj",
+      "src\\Testing\\src\\Microsoft.AspNetCore.Testing.csproj"
     ]
   }
 }

src/Servers/HttpSys/src/AsyncAcceptContext.cs

@@ -74,13 +74,16 @@ private static void IOCompleted(AsyncAcceptContext asyncContext, uint errorCode,
 
                         if (server.ValidateRequest(requestContext) && server.ValidateAuth(requestContext))
                         {
-                            // It's important that we clear the native request context before we set the result
-                            // we want to reuse this object for future accepts.
+                            // It's important that we clear the request context before we set the result
+                            // we want to reuse the acceptContext object for future accepts.
                             asyncContext._requestContext = null;
 
-                            requestContext.Initialize();
+                            // Initialize features here once we're successfully validated the request
+                            // TODO: In the future defer this work to the thread pool so we can get off the IO thread
+                            // as quickly as possible
+                            requestContext.InitializeFeatures();
 
-                            asyncContext._tcs.SetResult(requestContext);
+                            asyncContext._mrvts.SetResult(requestContext);
 
                             complete = true;
                         }
@@ -199,11 +202,11 @@ protected virtual void Dispose(bool disposing)
         {
             if (disposing)
             {
-                if (_nativeRequestContext != null)
+                if (_requestContext != null)
                 {
-                    _nativeRequestContext.ReleasePins();
-                    _nativeRequestContext.Dispose();
-                    _nativeRequestContext = null;
+                    _requestContext.ReleasePins();
+                    _requestContext.Dispose();
+                    _requestContext = null;
 
                     var boundHandle = Server.RequestQueue.BoundHandle;
 

src/Servers/HttpSys/src/RequestProcessing/RequestContext.FeatureCollection.cs

@@ -93,6 +93,40 @@ private enum Fields
             TraceIdentifier = 0x200,
         }
 
+        public void InitializeFeatures()
+        {
+            if (_initialized)
+            {
+                return;
+            }
+
+            _initialized = true;
+
+            Request = new Request(this);
+            Response = new Response(this);
+
+            _features = new FeatureCollection(new StandardFeatureCollection(this));
+            _enableResponseCaching = Server.Options.EnableResponseCaching;
+
+            // Pre-initialize any fields that are not lazy at the lower level.
+            _requestHeaders = Request.Headers;
+            _httpMethod = Request.Method;
+            _path = Request.Path;
+            _pathBase = Request.PathBase;
+            _query = Request.QueryString;
+            _rawTarget = Request.RawUrl;
+            _scheme = Request.Scheme;
+
+            if (Server.Options.Authentication.AutomaticAuthentication)
+            {
+                _user = User;
+            }
+
+            _responseStream = new ResponseStream(Response.Body, OnResponseStart);
+            _responseHeaders = Response.Headers;
+        }
+
+
         private bool IsNotInitialized(Fields field)
         {
             return (_initializedFields & field) != field;

src/Servers/HttpSys/src/RequestProcessing/RequestContext.cs

@@ -2,16 +2,13 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Collections.Concurrent;
 using System.Diagnostics;
 using System.IO;
-using System.Runtime.InteropServices;
 using System.Security.Authentication.ExtendedProtection;
 using System.Security.Principal;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.HttpSys.Internal;
 using Microsoft.Extensions.Logging;
 
@@ -38,9 +35,9 @@ public RequestContext(HttpSysListener server, uint? bufferSize, ulong requestId)
 
         internal ILogger Logger => Server.Logger;
 
-        public Request Request { get; set; }
+        public Request Request { get; private set; }
 
-        public Response Response { get; set; }
+        public Response Response { get; private set; }
 
         public WindowsPrincipal User => Request.User;
 
@@ -251,8 +248,6 @@ public async void Execute()
             var messagePump = MessagePump;
             var application = messagePump.Application;
 
-            Initialize();
-
             try
             {
                 if (messagePump.Stopping)
@@ -323,39 +318,6 @@ public async void Execute()
             }
         }
 
-        public void Initialize()
-        {
-            if (_initialized)
-            {
-                return;
-            }
-
-            _initialized = true;
-
-            Request = new Request(this);
-            Response = new Response(this);
-
-            _features = new FeatureCollection(new StandardFeatureCollection(this));
-            _enableResponseCaching = Server.Options.EnableResponseCaching;
-
-            // Pre-initialize any fields that are not lazy at the lower level.
-            _requestHeaders = Request.Headers;
-            _httpMethod = Request.Method;
-            _path = Request.Path;
-            _pathBase = Request.PathBase;
-            _query = Request.QueryString;
-            _rawTarget = Request.RawUrl;
-            _scheme = Request.Scheme;
-
-            if (Server.Options.Authentication.AutomaticAuthentication)
-            {
-                _user = User;
-            }
-
-            _responseStream = new ResponseStream(Response.Body, OnResponseStart);
-            _responseHeaders = Response.Headers;
-        }
-
         private void SetFatalResponse(int status)
         {
             Response.StatusCode = status;