diff --git a/NuGet.config b/NuGet.config index 014238cb75..dd82c96ac2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,12 +4,10 @@ - + - - - + @@ -24,12 +22,10 @@ - - - + - + diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 87a2693fee..f7d0554e84 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,28 +2,28 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - - - + + + @@ -37,108 +37,108 @@ - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - - + + - 5.0.6 + 5.0.7 - - + + - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - + - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 @@ -146,110 +146,110 @@ - 5.0.6 + 5.0.7 - + - + - + - 5.0.6 + 5.0.7 - + - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - + - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - - + + - 5.0.6 + 5.0.7 - + - 5.0.6 + 5.0.7 - - - + + + - 5.0.6 + 5.0.7 - - + + - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - - + + - 5.0.6 + 5.0.7 - - + + - 5.0.6 + 5.0.7 @@ -257,86 +257,86 @@ - 5.0.6 + 5.0.7 - + - + - + - + - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - + - + - + - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - - + + - 5.0.6 + 5.0.7 - + - + - + - 5.0.6 + 5.0.7 - + - + - 5.0.6 + 5.0.7 - - + + @@ -346,8 +346,8 @@ - - + + @@ -356,8 +356,8 @@ - - + + @@ -368,14 +368,14 @@ - 5.0.6 + 5.0.7 - + - 5.0.6 + 5.0.7 @@ -383,50 +383,50 @@ - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - + - + - + - 5.0.6 + 5.0.7 - + - + - + - 5.0.6 + 5.0.7 @@ -442,27 +442,27 @@ - 5.0.6 + 5.0.7 - - + + - - + + - 5.0.6 + 5.0.7 - - + + - 5.0.6 + 5.0.7 @@ -474,185 +474,185 @@ - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - + - 5.0.6 + 5.0.7 - - + + - 5.0.6 + 5.0.7 - - + + - 5.0.6 + 5.0.7 - + - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - + - 5.0.6 + 5.0.7 - + - 5.0.6 + 5.0.7 - - + + - - + + - - + + - 5.0.6 + 5.0.7 - - + + - - + + - 5.0.6 + 5.0.7 - + - + - + - 5.0.6 + 5.0.7 - + - + - + - 5.0.6 + 5.0.7 - + - + - 5.0.6 + 5.0.7 - + - + - 5.0.6 + 5.0.7 - - - - + + + + - 5.0.6 + 5.0.7 @@ -661,65 +661,65 @@ - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - + - 5.0.6 + 5.0.7 - + - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 @@ -735,42 +735,42 @@ - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - - - + + + - 5.0.6 + 5.0.7 - + - + - + - 5.0.6 + 5.0.7 @@ -780,73 +780,73 @@ - 5.0.6 + 5.0.7 - + - + - + - 5.0.6 + 5.0.7 - + - + - + - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 - + - + - + - 5.0.6 + 5.0.7 @@ -867,11 +867,11 @@ - 5.0.6 + 5.0.7 - 5.0.6 + 5.0.7 @@ -889,13 +889,13 @@ - 5.0.6 + 5.0.7 - + - 5.0.6 + 5.0.7 \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 0a3fdf2861..78cda625dc 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,105 +4,105 @@ This file contains a list of all the packages and their versions which were rele Update this list when preparing for a new patch. --> - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 234ca9bc2d..ca4ee8f3ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://github.com/dotnet/efcore - 42e81439158d5884dab24326c84ed95cd4baaa21 + f8a6198dad41e8ed584da6ff711837f3288f8a8d - + https://github.com/dotnet/efcore - 42e81439158d5884dab24326c84ed95cd4baaa21 + f8a6198dad41e8ed584da6ff711837f3288f8a8d - + https://github.com/dotnet/efcore - 42e81439158d5884dab24326c84ed95cd4baaa21 + f8a6198dad41e8ed584da6ff711837f3288f8a8d - + https://github.com/dotnet/efcore - 42e81439158d5884dab24326c84ed95cd4baaa21 + f8a6198dad41e8ed584da6ff711837f3288f8a8d - + https://github.com/dotnet/efcore - 42e81439158d5884dab24326c84ed95cd4baaa21 + f8a6198dad41e8ed584da6ff711837f3288f8a8d - + https://github.com/dotnet/efcore - 42e81439158d5884dab24326c84ed95cd4baaa21 + f8a6198dad41e8ed584da6ff711837f3288f8a8d - + https://github.com/dotnet/efcore - 42e81439158d5884dab24326c84ed95cd4baaa21 + f8a6198dad41e8ed584da6ff711837f3288f8a8d - + https://github.com/dotnet/efcore - 42e81439158d5884dab24326c84ed95cd4baaa21 + f8a6198dad41e8ed584da6ff711837f3288f8a8d https://github.com/dotnet/runtime @@ -294,17 +294,17 @@ Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime. All Runtime.$rid packages should have the same version. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 556582d964cc21b82a88d7154e915076f6f9008e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 556582d964cc21b82a88d7154e915076f6f9008e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 478b2f8c0e480665f6c52c95cd57830784dc9560 + 556582d964cc21b82a88d7154e915076f6f9008e diff --git a/eng/Versions.props b/eng/Versions.props index e23d760d7e..d9cb8fd2e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ 5 0 8 - false + true @@ -59,10 +59,10 @@ 5.0.0 - 5.0.6-servicing.21220.11 + 5.0.7-servicing.21255.8 5.0.0 - 5.0.6 - 5.0.6-servicing.21220.11 + 5.0.7 + 5.0.7-servicing.21255.8 5.0.0 5.0.0 5.0.0 @@ -127,14 +127,14 @@ 5.0.2 - 5.0.6 - 5.0.6 - 5.0.6 - 5.0.6 - 5.0.6 - 5.0.6 - 5.0.6 - 5.0.6 + 5.0.7 + 5.0.7 + 5.0.7 + 5.0.7 + 5.0.7 + 5.0.7 + 5.0.7 + 5.0.7 5.0.0-beta.21160.3 @@ -238,7 +238,7 @@ 2.1.1 2.2.0 - 3.1.15-servicing-21215-12 + 3.1.16-servicing-21263-5 $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion) $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion) diff --git a/global.json b/global.json index 1b6aca209f..8dd41ed5f4 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "5.0.203" + "version": "5.0.204" }, "tools": { - "dotnet": "5.0.203", + "dotnet": "5.0.204", "runtimes": { "dotnet/x64": [ "2.1.28", @@ -13,7 +13,7 @@ "$(MicrosoftNETCoreAppInternalPackageVersion)" ], "aspnetcore/x64": [ - "3.1.15" + "3.1.16" ] }, "Git": "2.22.0", diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp index 0328adec4e..9aedd1eb5b 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp @@ -91,14 +91,6 @@ REQUEST_NOTIFICATION_STATUS IN_PROCESS_HANDLER::ServerShutdownMessage() const VOID IN_PROCESS_HANDLER::NotifyDisconnect() { - ::RaiseEvent(m_pW3Context, nullptr); - - if (m_pApplication->QueryBlockCallbacksIntoManaged() || - m_fManagedRequestComplete) - { - return; - } - // NotifyDisconnect can be called before the m_pManagedHttpContext is set, // so save that in a bool. // Don't lock when calling m_pDisconnect to avoid the potential deadlock between this @@ -106,6 +98,15 @@ IN_PROCESS_HANDLER::NotifyDisconnect() void* pManagedHttpContext = nullptr; { SRWExclusiveLock lock(m_srwDisconnectLock); + + if (m_pApplication->QueryBlockCallbacksIntoManaged() || + m_fManagedRequestComplete) + { + return; + } + + ::RaiseEvent(m_pW3Context, nullptr); + pManagedHttpContext = m_pManagedHttpContext; m_disconnectFired = true; } @@ -121,8 +122,11 @@ IN_PROCESS_HANDLER::IndicateManagedRequestComplete( VOID ) { - m_fManagedRequestComplete = TRUE; - m_pManagedHttpContext = nullptr; + { + SRWExclusiveLock lock(m_srwDisconnectLock); + m_fManagedRequestComplete = TRUE; + m_pManagedHttpContext = nullptr; + } ::RaiseEvent(m_pW3Context, nullptr); }