Fix 0 request scenario

Author: jkotalik

src/Servers/IIS/AspNetCoreModuleV2/CommonLib/application.h

@@ -7,6 +7,7 @@
 #include "iapplication.h"
 #include "ntassert.h"
 #include "SRWExclusiveLock.h"
+#include "SRWSharedLock.h"
 #include "exceptions.h"
 
 class APPLICATION : public IAPPLICATION
@@ -21,14 +22,17 @@ class APPLICATION : public IAPPLICATION
         _In_  IHttpContext       *pHttpContext,
         _Outptr_result_maybenull_ IREQUEST_HANDLER  **pRequestHandler) override
     {
-        TraceContextScope traceScope(pHttpContext->GetTraceContext());
         *pRequestHandler = nullptr;
 
+        SRWSharedLock stopLock(m_stateLock);
+
         if (m_fStopCalled)
         {
             return S_FALSE;
         }
 
+        TraceContextScope traceScope(pHttpContext->GetTraceContext());
+
         return CreateHandler(pHttpContext, pRequestHandler);
     }
 

src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp

@@ -68,6 +68,13 @@ IN_PROCESS_APPLICATION::StopClr()
         {
             shutdownHandler(m_ShutdownHandlerContext);
         }
+
+        auto requestCount = m_requestCount.load();
+        if (requestCount == 0)
+        {
+            LOG_INFO(L"Drained all requests, notifying managed.");
+            m_RequestsDrainedHandler(m_ShutdownHandlerContext);
+        }
     }
 
     // Signal shutdown
@@ -537,6 +544,7 @@ IN_PROCESS_APPLICATION::CreateHandler(
 void
 IN_PROCESS_APPLICATION::HandleRequestCompletion()
 {
+    SRWSharedLock lock(m_stateLock);
     auto requestCount = m_requestCount--;
     if (m_fStopCalled && requestCount == 0)
     {