diff --git a/.gitignore b/.gitignore index e353a67858..74f65a6ecf 100644 --- a/.gitignore +++ b/.gitignore @@ -55,7 +55,8 @@ src/*/AspNetCore/aspnetcoremodule.h src/*/AspNetCore/aspnetcore_msg.h src/*/AspNetCore/aspnetcore_msg.rc src/*/*/version.h -src/*/RequestHandler/version.h +src/*/InProcessRequestHandler/version.h +src/*/OutOfProcessRequestHandler/version.h src/*/CommonLib/aspnetcore_msg.h src/*/CommonLib/aspnetcore_msg.rc test/*/Debug diff --git a/IISIntegration.sln b/IISIntegration.sln index a5dbd5dad6..a7b2c54b60 100644 --- a/IISIntegration.sln +++ b/IISIntegration.sln @@ -92,14 +92,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonLib", "src\AspNetCore EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IISLib", "src\AspNetCoreModuleV2\IISLib\IISLib.vcxproj", "{09D9D1D6-2951-4E14-BC35-76A23CF9391A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RequestHandler", "src\AspNetCoreModuleV2\RequestHandler\RequestHandler.vcxproj", "{D57EA297-6DC2-4BC0-8C91-334863327863}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OutOfProcessWebSite", "test\WebSites\OutOfProcessWebSite\OutOfProcessWebSite.csproj", "{42E60F88-E23F-417A-8143-0CCEC05E1D02}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{622D35C9-627B-466E-8D15-752968CC79AF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.Performance", "benchmarks\IIS.Performance\IIS.Performance.csproj", "{48F46909-E76A-4788-BCE1-E543C0E140FE}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InProcessRequestHandler", "src\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj", "{D57EA297-6DC2-4BC0-8C91-334863327863}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OutOfProcessRequestHandler", "src\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj", "{7F87406C-A3C8-4139-A68D-E4C344294A67}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -294,16 +296,6 @@ Global {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x64.Build.0 = Release|x64 {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x86.ActiveCfg = Release|Win32 {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x86.Build.0 = Release|Win32 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x64.ActiveCfg = Debug|x64 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x64.Build.0 = Debug|x64 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x86.ActiveCfg = Debug|Win32 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x86.Build.0 = Debug|Win32 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|Any CPU.ActiveCfg = Release|Win32 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x64.ActiveCfg = Release|x64 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x64.Build.0 = Release|x64 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x86.ActiveCfg = Release|Win32 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x86.Build.0 = Release|Win32 {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|Any CPU.ActiveCfg = Debug|x86 {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x64.ActiveCfg = Debug|x64 {42E60F88-E23F-417A-8143-0CCEC05E1D02}.Debug|x64.Build.0 = Debug|x64 @@ -326,6 +318,26 @@ Global {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|x64.Build.0 = Release|Any CPU {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|x86.ActiveCfg = Release|Any CPU {48F46909-E76A-4788-BCE1-E543C0E140FE}.Release|x86.Build.0 = Release|Any CPU + {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x64.ActiveCfg = Debug|x64 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x64.Build.0 = Debug|x64 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x86.ActiveCfg = Debug|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x86.Build.0 = Debug|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|Any CPU.ActiveCfg = Release|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x64.ActiveCfg = Release|x64 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x64.Build.0 = Release|x64 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x86.ActiveCfg = Release|Win32 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x86.Build.0 = Release|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x64.ActiveCfg = Debug|x64 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x64.Build.0 = Debug|x64 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x86.ActiveCfg = Debug|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x86.Build.0 = Debug|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|Any CPU.ActiveCfg = Release|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x64.ActiveCfg = Release|x64 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x64.Build.0 = Release|x64 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x86.ActiveCfg = Release|Win32 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -351,9 +363,10 @@ Global {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} {55494E58-E061-4C4C-A0A8-837008E72F85} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} {09D9D1D6-2951-4E14-BC35-76A23CF9391A} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} - {D57EA297-6DC2-4BC0-8C91-334863327863} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} {42E60F88-E23F-417A-8143-0CCEC05E1D02} = {744ACDC6-F6A0-4FF9-9421-F25C5F2DC520} {48F46909-E76A-4788-BCE1-E543C0E140FE} = {622D35C9-627B-466E-8D15-752968CC79AF} + {D57EA297-6DC2-4BC0-8C91-334863327863} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} + {7F87406C-A3C8-4139-A68D-E4C344294A67} = {06CA2C2B-83B0-4D83-905A-E0C74790009E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {DB4F868D-E1AE-4FD7-9333-69FA15B268C5} diff --git a/build/build.msbuild b/build/build.msbuild index 86984b2cb4..c97f1a53b5 100644 --- a/build/build.msbuild +++ b/build/build.msbuild @@ -5,7 +5,8 @@ - + + diff --git a/build/repo.targets b/build/repo.targets index d56787031b..a70e25df5f 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -1,32 +1,63 @@ + InitializeComponents;$(PrepareDependsOn) BuildNativeAssets;$(CompileDependsOn) $(PackageDependsOn);PackageNativeProjects - RunNativeTest;$(TestDependsOn) + $(TestDependsOn);RunNativeTest $(RepositoryRoot)NuGetPackageVerifier.xplat.json + $(RepositoryRoot)src\ + bin\$(Configuration)\ + + + + + + + + + + + + + + + + + + + -p:Configuration=$(Configuration) -v:m -nologo -clp:NoSummary -p:CommitHash=$(CommitHash) - + - - - - @@ -54,12 +85,8 @@ - - - - - - + + @@ -76,24 +103,13 @@ BasePath="$(RepositoryRoot)" /> - - - - - - - - - - - - - - + + + - - - + + + - - - - - diff --git a/build/testsite.props b/build/testsite.props index aa60d852e4..be0f2c72cc 100644 --- a/build/testsite.props +++ b/build/testsite.props @@ -29,8 +29,10 @@ - - + + + + @@ -43,7 +45,7 @@ $(NativePlatform)\aspnetcore.dll $(NativePlatform)\aspnetcorev2.dll - $(NativePlatform)\aspnetcorerh.dll + $(NativePlatform)\aspnetcorev2_inprocess.dll $(userprofile)\.dotnet\$(NativePlatform)\dotnet.exe @@ -64,7 +66,7 @@ $(MSBuildThisFileDirectory)..\test\TestTasks\bin\$(Configuration)\$(TargetFramework)\TestTasks $(InjectDepsAssembly) - "win7-$(NativePlatform)" "$(AncmRHPath)" + "win7-$(NativePlatform)" "$(AncmInProcessRHPath)" diff --git a/nuget/AspNetCoreV2.nuspec b/nuget/AspNetCoreV2.nuspec index 6e0f6470f1..6de70ba91a 100644 --- a/nuget/AspNetCoreV2.nuspec +++ b/nuget/AspNetCoreV2.nuspec @@ -21,8 +21,10 @@ - - + + + + diff --git a/nuget/Microsoft.AspNetCore.AspNetCoreModule.props b/nuget/Microsoft.AspNetCore.AspNetCoreModule.props index 5b01ee63a4..ab1379787b 100644 --- a/nuget/Microsoft.AspNetCore.AspNetCoreModule.props +++ b/nuget/Microsoft.AspNetCore.AspNetCoreModule.props @@ -3,8 +3,10 @@ $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcore.dll $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcore.dll - $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcorerh.dll - $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcorerh.dll + $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcorev2_inprocess.dll + $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcorev2_inprocess.dll + $(MSBuildThisFileDirectory)..\contentFiles\any\any\x64\aspnetcorev2_outofprocess.dll + $(MSBuildThisFileDirectory)..\contentFiles\any\any\x86\aspnetcorev2_outofprocess.dll diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp index 656e903b76..6d7ea5bbf1 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp @@ -365,7 +365,7 @@ APPLICATION_INFO::FindNativeAssemblyFromGlobalLocation(STRU* struFilename) else if ((dwReturnedSize == dwSize) && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { dwSize *= 2; // smaller buffer. increase the buffer and retry - if (FAILED(hr = struFilename->Resize(dwSize + 20))) // + 20 for aspnetcorerh.dll + if (FAILED(hr = struFilename->Resize(dwSize + 40))) // + 40 for aspnetcorerh.dll { goto Finished; } @@ -385,7 +385,7 @@ APPLICATION_INFO::FindNativeAssemblyFromGlobalLocation(STRU* struFilename) if (FAILED(hr = struFilename->SyncWithBuffer()) || FAILED(hr = struFilename->Append(L"\\")) || - FAILED(hr = struFilename->Append(g_pwzAspnetcoreRequestHandlerName))) + FAILED(hr = struFilename->Append(g_pwzAspnetcoreOutOfProcessRequestHandlerName))) { goto Finished; } @@ -498,7 +498,7 @@ APPLICATION_INFO::FindNativeAssemblyFromHostfxr( } } - if (FAILED(hr = struNativeDllLocation.Append(g_pwzAspnetcoreRequestHandlerName))) + if (FAILED(hr = struNativeDllLocation.Append(g_pwzAspnetcoreInProcessRequestHandlerName))) { goto Finished; } diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp b/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp index 56829cb382..3e0cffc323 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp +++ b/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp @@ -19,7 +19,8 @@ DWORD g_dwActiveServerProcesses = 0; SRWLOCK g_srwLock; DWORD g_dwDebugFlags = 0; PCSTR g_szDebugLabel = "ASPNET_CORE_MODULE"; -PCWSTR g_pwzAspnetcoreRequestHandlerName = L"aspnetcorerh.dll"; +PCWSTR g_pwzAspnetcoreInProcessRequestHandlerName = L"aspnetcorev2_inprocess.dll"; +PCWSTR g_pwzAspnetcoreOutOfProcessRequestHandlerName = L"aspnetcorev2_outofprocess.dll"; PFN_ASPNETCORE_CREATE_APPLICATION g_pfnAspNetCoreCreateApplication; VOID diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx b/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx index d411a47308..8b359c8550 100644 --- a/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx +++ b/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx @@ -153,7 +153,8 @@ extern DWORD g_dwActiveServerProcesses; extern HINSTANCE g_hModule; extern HMODULE g_hAspnetCoreRH; extern SRWLOCK g_srwLock; -extern PCWSTR g_pwzAspnetcoreRequestHandlerName; extern HANDLE g_hEventLog; +extern PCWSTR g_pwzAspnetcoreInProcessRequestHandlerName; +extern PCWSTR g_pwzAspnetcoreOutOfProcessRequestHandlerName; extern PFN_ASPNETCORE_CREATE_APPLICATION g_pfnAspNetCoreCreateApplication; #pragma warning( error : 4091) diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 73b08b965e..728c42bb9e 100644 --- a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -181,6 +181,7 @@ + @@ -189,6 +190,7 @@ + Create diff --git a/src/AspNetCoreModuleV2/RequestHandler/aspnetcore_event.h b/src/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/aspnetcore_event.h rename to src/AspNetCoreModuleV2/CommonLib/aspnetcore_event.h diff --git a/src/AspNetCoreModuleV2/RequestHandler/disconnectcontext.h b/src/AspNetCoreModuleV2/CommonLib/disconnectcontext.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/disconnectcontext.h rename to src/AspNetCoreModuleV2/CommonLib/disconnectcontext.h diff --git a/src/AspNetCoreModuleV2/RequestHandler/environmentvariablehelpers.h b/src/AspNetCoreModuleV2/CommonLib/environmentvariablehelpers.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/environmentvariablehelpers.h rename to src/AspNetCoreModuleV2/CommonLib/environmentvariablehelpers.h diff --git a/src/AspNetCoreModuleV2/RequestHandler/requesthandler_config.cpp b/src/AspNetCoreModuleV2/CommonLib/requesthandler_config.cpp similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/requesthandler_config.cpp rename to src/AspNetCoreModuleV2/CommonLib/requesthandler_config.cpp diff --git a/src/AspNetCoreModuleV2/RequestHandler/requesthandler_config.h b/src/AspNetCoreModuleV2/CommonLib/requesthandler_config.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/requesthandler_config.h rename to src/AspNetCoreModuleV2/CommonLib/requesthandler_config.h diff --git a/src/AspNetCoreModuleV2/RequestHandler/sttimer.h b/src/AspNetCoreModuleV2/CommonLib/sttimer.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/sttimer.h rename to src/AspNetCoreModuleV2/CommonLib/sttimer.h diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj new file mode 100644 index 0000000000..7cb549ffd1 --- /dev/null +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj @@ -0,0 +1,241 @@ + + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {D57EA297-6DC2-4BC0-8C91-334863327863} + Win32Proj + InProcessRequestHandler + 10.0.15063.0 + InProcessRequestHandler + + + + DynamicLibrary + true + v141 + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + DynamicLibrary + true + v141 + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + + + + + + + + + + + + + + + + + + + aspnetcorev2_inprocess + + + false + + + false + + + + NotUsing + Level4 + Disabled + WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + precomp.hxx + $(IntDir)$(TargetName).pch + ProgramDatabase + MultiThreadedDebug + ..\IISLib;..\CommonLib;.\Inc + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + + + Windows + true + kernel32.lib;user32.lib;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + Source.def + + + + + NotUsing + Level4 + Disabled + WIN32;_DEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + precomp.hxx + $(IntDir)$(TargetName).pch + ProgramDatabase + MultiThreadedDebug + ..\IISLib;..\CommonLib;.\Inc + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + + + Windows + true + kernel32.lib;user32.lib;advapi32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + Source.def + + + + + Level4 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;REQUESTHANDLER_EXPORTS;%(PreprocessorDefinitions) + precomp.hxx + MultiThreaded + ..\IISLib;..\CommonLib;.\Inc + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + + + Windows + false + true + true + Source.def + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;winhttp.lib;odbc32.lib;ws2_32.lib;odbccp32.lib;wbemuuid.lib;iphlpapi.lib;pdh.lib;rpcrt4.lib;%(AdditionalDependencies) + + + + + Level4 + NotUsing + MaxSpeed + true + true + NDEBUG;REQUESTHANDLER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + precomp.hxx + MultiThreaded + ..\IISLib;..\CommonLib;.\Inc + true + true + true + false + SyncCThrow + 8Bytes + true + false + true + CompileAsCpp + true + + + Windows + false + true + true + Source.def + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;ahadmin.lib;rpcrt4.lib;winhttp.lib;pdh.lib;ws2_32.lib;wbemuuid.lib;iphlpapi.lib;%(AdditionalDependencies) + + + + + + + + + + + + + + + + + + + + {55494e58-e061-4c4c-a0a8-837008e72f85} + + + {4787a64f-9a3e-4867-a55a-70cb4b2b2ffe} + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/AspNetCoreModuleV2/RequestHandler/Source.def b/src/AspNetCoreModuleV2/InProcessRequestHandler/Source.def similarity index 50% rename from src/AspNetCoreModuleV2/RequestHandler/Source.def rename to src/AspNetCoreModuleV2/InProcessRequestHandler/Source.def index 86c8c2a268..c540402c00 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/Source.def +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/Source.def @@ -1,4 +1,4 @@ -LIBRARY aspnetcorerh +LIBRARY aspnetcorev2_inprocess EXPORTS CreateApplication diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx new file mode 100644 index 0000000000..aa557dfbef --- /dev/null +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cxx @@ -0,0 +1,133 @@ +// dllmain.cpp : Defines the entry point for the DLL application. +#include "precomp.hxx" +#include +#include + +BOOL g_fGlobalInitialize = FALSE; +BOOL g_fProcessDetach = FALSE; +DWORD g_dwAspNetCoreDebugFlags = 0; +DWORD g_dwDebugFlags = 0; +SRWLOCK g_srwLockRH; +IHttpServer * g_pHttpServer = NULL; +HINSTANCE g_hWinHttpModule; +HINSTANCE g_hAspNetCoreModule; +HANDLE g_hEventLog = NULL; +PCSTR g_szDebugLabel = "ASPNET_CORE_MODULE_INPROCESS_REQUEST_HANDLER"; + +VOID +InitializeGlobalConfiguration( + IHttpServer * pServer +) +{ + HKEY hKey; + BOOL fLocked = FALSE; + + if (!g_fGlobalInitialize) + { + AcquireSRWLockExclusive(&g_srwLockRH); + fLocked = TRUE; + + if (g_fGlobalInitialize) + { + // Done by another thread + goto Finished; + } + + g_pHttpServer = pServer; + if (pServer->IsCommandLineLaunch()) + { + g_hEventLog = RegisterEventSource(NULL, ASPNETCORE_IISEXPRESS_EVENT_PROVIDER); + } + else + { + g_hEventLog = RegisterEventSource(NULL, ASPNETCORE_EVENT_PROVIDER); + } + + if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\IIS Extensions\\IIS AspNetCore Module\\Parameters", + 0, + KEY_READ, + &hKey) == NO_ERROR) + { + DWORD dwType; + DWORD dwData; + DWORD cbData; + + cbData = sizeof(dwData); + if ((RegQueryValueEx(hKey, + L"DebugFlags", + NULL, + &dwType, + (LPBYTE)&dwData, + &cbData) == NO_ERROR) && + (dwType == REG_DWORD)) + { + g_dwAspNetCoreDebugFlags = dwData; + } + RegCloseKey(hKey); + } + + g_fGlobalInitialize = TRUE; + } +Finished: + if (fLocked) + { + ReleaseSRWLockExclusive(&g_srwLockRH); + } +} + +BOOL APIENTRY DllMain(HMODULE hModule, + DWORD ul_reason_for_call, + LPVOID lpReserved +) +{ + UNREFERENCED_PARAMETER(lpReserved); + + switch (ul_reason_for_call) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hModule); + InitializeSRWLock(&g_srwLockRH); + break; + case DLL_PROCESS_DETACH: + g_fProcessDetach = TRUE; + default: + break; + } + return TRUE; +} + +// TODO remove pHttpContext from the CreateApplication call. +HRESULT +__stdcall +CreateApplication( + _In_ IHttpServer *pServer, + _In_ IHttpContext *pHttpContext, + _In_ PCWSTR pwzExeLocation, + _Out_ IAPPLICATION **ppApplication +) +{ + HRESULT hr = S_OK; + IAPPLICATION *pApplication = NULL; + REQUESTHANDLER_CONFIG *pConfig; + // Initialze some global variables here + InitializeGlobalConfiguration(pServer); + + hr = REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig(pServer, pHttpContext->GetApplication(), pwzExeLocation, g_hEventLog, &pConfig); + if (FAILED(hr)) + { + return hr; + } + + pApplication = new IN_PROCESS_APPLICATION(pServer, pConfig); + if (pApplication == NULL) + { + hr = HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY); + goto Finished; + } + + *ppApplication = pApplication; + +Finished: + return hr; +} diff --git a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.cpp similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.cpp rename to src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.cpp diff --git a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.h rename to src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocessapplication.h diff --git a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.cpp b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocesshandler.cpp similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.cpp rename to src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocesshandler.cpp diff --git a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.h b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocesshandler.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.h rename to src/AspNetCoreModuleV2/InProcessRequestHandler/inprocess/inprocesshandler.h diff --git a/src/AspNetCoreModuleV2/RequestHandler/requesthandler.rc b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessrequesthandler.rc similarity index 95% rename from src/AspNetCoreModuleV2/RequestHandler/requesthandler.rc rename to src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessrequesthandler.rc index 2cc99c2331..bf1e4d5191 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/requesthandler.rc +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/inprocessrequesthandler.rc @@ -78,9 +78,9 @@ BEGIN VALUE "CompanyName", "Microsoft" VALUE "FileDescription", FileDescription VALUE "FileVersion", FileVersionStr - VALUE "InternalName", "aspnetcorerh.dll" + VALUE "InternalName", "aspnetcorev2_inprocess.dll" VALUE "LegalCopyright", "Copyright (C) Microsoft Corporation" - VALUE "OriginalFilename", "aspnetcorerh.dll" + VALUE "OriginalFilename", "aspnetcorev2_inprocess.dll" VALUE "ProductName", "ASP.NET Core Module Request Handler" VALUE "ProductVersion", ProductVersionStr END diff --git a/src/AspNetCoreModuleV2/RequestHandler/managedexports.cxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/managedexports.cxx rename to src/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cxx diff --git a/src/AspNetCoreModuleV2/InProcessRequestHandler/precomp.hxx b/src/AspNetCoreModuleV2/InProcessRequestHandler/precomp.hxx new file mode 100644 index 0000000000..2a2c5812e7 --- /dev/null +++ b/src/AspNetCoreModuleV2/InProcessRequestHandler/precomp.hxx @@ -0,0 +1,104 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +#pragma once +#pragma warning( disable : 4091) + +// +// System related headers +// +#define _WINSOCKAPI_ + +#define NTDDI_VERSION 0x06010000 +#define WINVER 0x0601 +#define _WIN32_WINNT 0x0601 + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +// This should remove our issue of compiling for win7 without header files. +// We force the Windows 8 version check logic in iiswebsocket.h to succeed even though we're compiling for Windows 7. +// Then, we set the version defines back to Windows 7 to for the remainder of the compilation. +#undef NTDDI_VERSION +#undef WINVER +#undef _WIN32_WINNT +#define NTDDI_VERSION 0x06020000 +#define WINVER 0x0602 +#define _WIN32_WINNT 0x0602 +#include +#undef NTDDI_VERSION +#undef WINVER +#undef _WIN32_WINNT + +#define NTDDI_VERSION 0x06010000 +#define WINVER 0x0601 +#define _WIN32_WINNT 0x0601 + +#include "..\IISLib\acache.h" +#include "..\IISLib\multisz.h" +#include "..\IISLib\multisza.h" +#include "..\IISLib\base64.h" +#include "..\IISLib\listentry.h" +#include "..\CommonLib\fx_ver.h" +#include "..\CommonLib\debugutil.h" +#include "..\CommonLib\requesthandler.h" +#include "..\CommonLib\requesthandler_config.h" +#include "..\CommonLib\utility.h" +#include "..\CommonLib\application.h" +#include "..\CommonLib\resources.h" +#include "aspnetcore_event.h" +#include "aspnetcore_msg.h" +#include "disconnectcontext.h" +#include "environmentvariablehelpers.h" +#include "sttimer.h" +#include ".\inprocess\InProcessHandler.h" +#include ".\inprocess\inprocessapplication.h" + +#ifdef max +#undef max +template inline T max(T a, T b) +{ + return a > b ? a : b; +} +#endif + +#ifdef min +#undef min +template inline T min(T a, T b) +{ + return a < b ? a : b; +} +#endif + + +inline bool IsSpace(char ch) +{ + switch (ch) + { + case 32: // ' ' + case 9: // '\t' + case 10: // '\n' + case 13: // '\r' + case 11: // '\v' + case 12: // '\f' + return true; + default: + return false; + } +} + +extern BOOL g_fAsyncDisconnectAvailable; +extern BOOL g_fEnableReferenceCountTracing; +extern BOOL g_fProcessDetach; +extern SRWLOCK g_srwLockRH; +extern HANDLE g_hEventLog; diff --git a/src/AspNetCoreModuleV2/RequestHandler/RequestHandler.vcxproj b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj similarity index 95% rename from src/AspNetCoreModuleV2/RequestHandler/RequestHandler.vcxproj rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj index ff49cffd42..33c8b4046a 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/RequestHandler.vcxproj +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj @@ -21,11 +21,11 @@ 15.0 - {D57EA297-6DC2-4BC0-8C91-334863327863} + {7F87406C-A3C8-4139-A68D-E4C344294A67} Win32Proj - RequestHandler + OutOfProcessRequestHandler 10.0.15063.0 - RequestHandler + OutOfProcessRequestHandler @@ -73,7 +73,7 @@ - aspnetcorerh + aspnetcorev2_outofprocess false @@ -209,7 +209,6 @@ - @@ -219,18 +218,13 @@ - - - - - @@ -238,7 +232,6 @@ - @@ -249,7 +242,7 @@ - + diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/Source.def b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/Source.def new file mode 100644 index 0000000000..37d763da5a --- /dev/null +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/Source.def @@ -0,0 +1,5 @@ +LIBRARY aspnetcorev2_outofprocess + +EXPORTS + CreateApplication + diff --git a/src/AspNetCoreModuleV2/RequestHandler/dllmain.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx similarity index 89% rename from src/AspNetCoreModuleV2/RequestHandler/dllmain.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx index d38d3a9417..d1b3179970 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/dllmain.cxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cxx @@ -294,41 +294,24 @@ CreateApplication( return hr; } - if (pConfig->QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_IN_PROCESS) + hr = EnsureOutOfProcessInitializtion(); + if (FAILED(hr)) { - pApplication = new IN_PROCESS_APPLICATION(pServer, pConfig); - if (pApplication == NULL) - { - hr = HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY); - goto Finished; - } + goto Finished; } - else if (pConfig->QueryHostingModel() == APP_HOSTING_MODEL::HOSTING_OUT_PROCESS) + + pApplication = new OUT_OF_PROCESS_APPLICATION(pConfig); + if (pApplication == NULL) { - hr = EnsureOutOfProcessInitializtion(); - if (FAILED(hr)) - { - goto Finished; - } - - pApplication = new OUT_OF_PROCESS_APPLICATION(pConfig); - if (pApplication == NULL) - { - hr = HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY); - goto Finished; - } - - hr = ((OUT_OF_PROCESS_APPLICATION*)pApplication)->Initialize(); - if (FAILED(hr)) - { - delete pApplication; - pApplication = NULL; - goto Finished; - } + hr = HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY); + goto Finished; } - else + + hr = ((OUT_OF_PROCESS_APPLICATION*)pApplication)->Initialize(); + if (FAILED(hr)) { - hr = HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED); + delete pApplication; + pApplication = NULL; goto Finished; } diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwarderconnection.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwarderconnection.cxx similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwarderconnection.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwarderconnection.cxx diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwarderconnection.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwarderconnection.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwarderconnection.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwarderconnection.h diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.cpp similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.cpp rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.cpp diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/forwardinghandler.h diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.cpp b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.cpp similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.cpp rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.cpp diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/outprocessapplication.h diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/processmanager.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.cxx similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/processmanager.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.cxx diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/processmanager.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/processmanager.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/processmanager.h diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/protocolconfig.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/protocolconfig.cxx similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/protocolconfig.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/protocolconfig.cxx diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/protocolconfig.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/protocolconfig.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/protocolconfig.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/protocolconfig.h diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/responseheaderhash.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/responseheaderhash.cxx similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/responseheaderhash.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/responseheaderhash.cxx diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/responseheaderhash.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/responseheaderhash.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/responseheaderhash.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/responseheaderhash.h diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/serverprocess.cxx similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/serverprocess.cxx diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/serverprocess.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/serverprocess.h diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/websockethandler.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/websockethandler.cxx similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/websockethandler.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/websockethandler.cxx diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/websockethandler.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/websockethandler.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/websockethandler.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/websockethandler.h diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/winhttphelper.cxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/winhttphelper.cxx similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/winhttphelper.cxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/winhttphelper.cxx diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/winhttphelper.h b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/winhttphelper.h similarity index 100% rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/winhttphelper.h rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocess/winhttphelper.h diff --git a/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc new file mode 100644 index 0000000000..eb32a08eb7 --- /dev/null +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/outofprocessrequesthandler.rc @@ -0,0 +1,119 @@ +// Microsoft Visual C++ generated resource script. +// +#include +#include "version.h" +#include "..\CommonLib\resources.h" +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#define FileDescription "IIS ASP.NET Core Module Request Handler. Commit: " CommitHash + +///////////////////////////////////////////////////////////////////////////// +// +// 11 +// + +//1 11 +//BEGIN +// 0x0001, 0x0000, 0x03e8, 0x0000, 0x03ed, 0x0000, 0x0010, 0x0000, 0x0010, +// 0x0001, 0x0025, 0x0031, 0x000d, 0x000a, 0x0000, 0x0000, 0x0010, 0x0001, +// 0x0025, 0x0031, 0x000d, 0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 0x0025, +// 0x0031, 0x000d, 0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 0x0025, 0x0031, +// 0x000d, 0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 0x0025, 0x0031, 0x000d, +// 0x000a, 0x0000, 0x0000, 0x0010, 0x0001, 0x0025, 0x0031, 0x000d, 0x000a, +// 0x0000, 0x0000 +//END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "..\CommonLib\resources.h\0" +END + +2 TEXTINCLUDE +BEGIN + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION FileVersion + PRODUCTVERSION ProductVersion + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "Microsoft" + VALUE "FileDescription", FileDescription + VALUE "FileVersion", FileVersionStr + VALUE "InternalName", "aspnetcorev2_outofprocess.dll" + VALUE "LegalCopyright", "Copyright (C) Microsoft Corporation" + VALUE "OriginalFilename", "aspnetcorev2_outofprocess.dll" + VALUE "ProductName", "ASP.NET Core Module Request Handler" + VALUE "ProductVersion", ProductVersionStr + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE +BEGIN + IDS_INVALID_PROPERTY "Property name '%s' in system.webServer/aspNetCore section has invalid value '%s' which does not conform to the prescribed format" + IDS_SERVER_ERROR "There was a connection error while trying to route the request." +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED diff --git a/src/AspNetCoreModuleV2/RequestHandler/precomp.hxx b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/precomp.hxx similarity index 94% rename from src/AspNetCoreModuleV2/RequestHandler/precomp.hxx rename to src/AspNetCoreModuleV2/OutOfProcessRequestHandler/precomp.hxx index 8fe43d1cdb..1cf69ec0dd 100644 --- a/src/AspNetCoreModuleV2/RequestHandler/precomp.hxx +++ b/src/AspNetCoreModuleV2/OutOfProcessRequestHandler/precomp.hxx @@ -62,11 +62,9 @@ #include "aspnetcore_event.h" #include "aspnetcore_msg.h" #include "disconnectcontext.h" +#include "requesthandler_config.h" #include "sttimer.h" -#include ".\requesthandler_config.h" -#include ".\inprocess\InProcessHandler.h" -#include ".\inprocess\inprocessapplication.h" #include ".\outofprocess\websockethandler.h" #include ".\outofprocess\responseheaderhash.h" #include ".\outofprocess\protocolconfig.h" @@ -76,7 +74,6 @@ #include ".\outofprocess\forwardinghandler.h" #include ".\outofprocess\outprocessapplication.h" #include ".\outofprocess\winhttphelper.h" -#include ".\outofprocess\outprocessapplication.h" #include "environmentvariablehelpers.h" diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj index b33643eb31..b792bfbb62 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj +++ b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj @@ -28,10 +28,10 @@ - - + + - - + + diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.nuspec b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.nuspec index 3124aad25f..8e6ff9c302 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.nuspec +++ b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.nuspec @@ -26,7 +26,7 @@ - - + + diff --git a/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs b/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs index a736edb2ca..9c5978db13 100644 --- a/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs +++ b/src/Microsoft.AspNetCore.Server.IIS/NativeMethods.cs @@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Server.IIS private const string KERNEL32 = "kernel32.dll"; - private const string AspNetCoreModuleDll = "aspnetcorerh.dll"; + private const string AspNetCoreModuleDll = "aspnetcorev2_inprocess.dll"; [DllImport(KERNEL32, ExactSpelling = true, SetLastError = true)]