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

Merged PR 14745: Call RaiseEvent later 

For 5.0
This commit is contained in:
Justin Kotalik 2021-05-12 16:41:45 +00:00
parent 6842f9086b
commit 356776891c
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp
View File

@ -91,14 +91,6 @@ REQUEST_NOTIFICATION_STATUS IN_PROCESS_HANDLER::ServerShutdownMessage() const
VOID VOID
IN_PROCESS_HANDLER::NotifyDisconnect() IN_PROCESS_HANDLER::NotifyDisconnect()
{ {
::RaiseEvent<ANCMEvents::ANCM_INPROC_REQUEST_DISCONNECT>(m_pW3Context, nullptr);
if (m_pApplication->QueryBlockCallbacksIntoManaged() ||
m_fManagedRequestComplete)
{
return;
}
// NotifyDisconnect can be called before the m_pManagedHttpContext is set, // NotifyDisconnect can be called before the m_pManagedHttpContext is set,
// so save that in a bool. // so save that in a bool.
// Don't lock when calling m_pDisconnect to avoid the potential deadlock between this // 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; void* pManagedHttpContext = nullptr;
{ {
SRWExclusiveLock lock(m_srwDisconnectLock); SRWExclusiveLock lock(m_srwDisconnectLock);
if (m_pApplication->QueryBlockCallbacksIntoManaged() ||
m_fManagedRequestComplete)
{
return;
}
::RaiseEvent<ANCMEvents::ANCM_INPROC_REQUEST_DISCONNECT>(m_pW3Context, nullptr);
pManagedHttpContext = m_pManagedHttpContext; pManagedHttpContext = m_pManagedHttpContext;
m_disconnectFired = true; m_disconnectFired = true;
} }
@ -121,8 +122,11 @@ IN_PROCESS_HANDLER::IndicateManagedRequestComplete(
VOID VOID
) )
{ {
m_fManagedRequestComplete = TRUE; {
m_pManagedHttpContext = nullptr; SRWExclusiveLock lock(m_srwDisconnectLock);
m_fManagedRequestComplete = TRUE;
m_pManagedHttpContext = nullptr;
}
::RaiseEvent<ANCMEvents::ANCM_INPROC_MANAGED_REQUEST_COMPLETION>(m_pW3Context, nullptr); ::RaiseEvent<ANCMEvents::ANCM_INPROC_MANAGED_REQUEST_COMPLETION>(m_pW3Context, nullptr);
} }