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

PR comments

This commit is contained in:
Pavel Krymets 2018-04-10 08:30:37 -07:00
parent e32b51d6e6
commit 80e799d17c
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup>
<Description>ASP.NET Core components for working with the IIS AspNetCoreModule.</Description>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>netstandard2.0;netcoreapp2.1</TargetFrameworks>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;iis</PackageTags>

2
src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs
View File

@ -89,7 +89,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration
[DllImport(AspNetCoreModuleDll)]
private static extern int http_get_server_variable(
IntPtr pInProcessHandler,
[MarshalAs(UnmanagedType.AnsiBStr)] string variableName,
[MarshalAs(UnmanagedType.LPStr)] string variableName,
[MarshalAs(UnmanagedType.BStr)] out string value);
[DllImport(AspNetCoreModuleDll)]

23
src/Microsoft.AspNetCore.Server.IISIntegration/Server/IISHttpServer.cs
View File

@ -144,16 +144,25 @@ namespace Microsoft.AspNetCore.Server.IISIntegration
var server = (IISHttpServer)GCHandle.FromIntPtr(pvRequestContext).Target;
Interlocked.Increment(ref server._outstandingRequests);
_ = Task.Run(
async () => {
var context = server._iisContextFactory.CreateHttpContext(pInProcessHandler);
var result = await context.ProcessRequestAsync();;
CompleteRequest(context, result);
});
#if NETCOREAPP2_1
ThreadPool.QueueUserWorkItem<(IISHttpServer, IntPtr)>(
state => _ = HandleRequest(state.Item1, state.Item2),
(server, pInProcessHandler),
preferLocal: false);
#else
ThreadPool.QueueUserWorkItem(
state => _ = HandleRequest(server, pInProcessHandler));
#endif
return NativeMethods.REQUEST_NOTIFICATION_STATUS.RQ_NOTIFICATION_PENDING;
}
private static async Task HandleRequest(IISHttpServer server, IntPtr handler)
{
var context = server._iisContextFactory.CreateHttpContext(handler);
var result = await context.ProcessRequestAsync();
CompleteRequest(context, result);
}
private static bool HandleShutdown(IntPtr pvRequestContext)
{
var server = (IISHttpServer)GCHandle.FromIntPtr(pvRequestContext).Target;