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

Merge pull request #1290 from dotnet-maestro-bot/merge/release/2.2-to-master

This commit is contained in:
Justin Kotalik 2018-08-21 16:42:52 -07:00 committed by GitHub
parent 453d488095 e23d9cb4ac
commit 8f89706939
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp
View File

@ -44,7 +44,6 @@ IN_PROCESS_APPLICATION::IN_PROCESS_APPLICATION(
IN_PROCESS_APPLICATION::~IN_PROCESS_APPLICATION() IN_PROCESS_APPLICATION::~IN_PROCESS_APPLICATION()
{ {
m_hThread = NULL;
s_Application = NULL; s_Application = NULL;
} }
@ -190,8 +189,6 @@ IN_PROCESS_APPLICATION::ShutDownInternal()
} }
} }
CloseHandle(m_hThread);
m_hThread = NULL;
s_Application = NULL; s_Application = NULL;
} }

4
src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.h
View File

@ -121,7 +121,7 @@ private:
}; };
// Thread executing the .NET Core process // Thread executing the .NET Core process
HANDLE m_hThread; HandleWrapper<InvalidHandleTraits> m_hThread;
// The request handler callback from managed code // The request handler callback from managed code
PFN_REQUEST_HANDLER m_RequestHandler; PFN_REQUEST_HANDLER m_RequestHandler;
@ -134,7 +134,7 @@ private:
PFN_ASYNC_COMPLETION_HANDLER m_AsyncCompletionHandler; PFN_ASYNC_COMPLETION_HANDLER m_AsyncCompletionHandler;
// The event that gets triggered when managed initialization is complete // The event that gets triggered when managed initialization is complete
HANDLE m_pInitalizeEvent; HandleWrapper<InvalidHandleTraits> m_pInitalizeEvent;
STRU m_struExeLocation; STRU m_struExeLocation;

3
test/IIS.FunctionalTests/Inprocess/StdOutRedirectionTests.cs
View File

@ -81,6 +81,7 @@ namespace IIS.FunctionalTests.Inprocess
} }
[ConditionalFact] [ConditionalFact]
[RequiresIIS(IISCapability.PoolEnvironmentVariables)]
[SkipIfDebug] [SkipIfDebug]
public async Task EnableCoreHostTraceLogging_TwoLogFilesCreated() public async Task EnableCoreHostTraceLogging_TwoLogFilesCreated()
{ {
@ -108,6 +109,7 @@ namespace IIS.FunctionalTests.Inprocess
} }
[ConditionalTheory] [ConditionalTheory]
[RequiresIIS(IISCapability.PoolEnvironmentVariables)]
[SkipIfDebug] [SkipIfDebug]
[InlineData("CheckLargeStdErrWrites")] [InlineData("CheckLargeStdErrWrites")]
[InlineData("CheckLargeStdOutWrites")] [InlineData("CheckLargeStdOutWrites")]
@ -131,6 +133,7 @@ namespace IIS.FunctionalTests.Inprocess
} }
[ConditionalTheory] [ConditionalTheory]
[RequiresIIS(IISCapability.PoolEnvironmentVariables)]
[SkipIfDebug] [SkipIfDebug]
[InlineData("CheckLargeStdErrWrites")] [InlineData("CheckLargeStdErrWrites")]
[InlineData("CheckLargeStdOutWrites")] [InlineData("CheckLargeStdOutWrites")]