Update

Author: jkotalik

src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ServerErrorApplication.h

@@ -27,7 +27,7 @@ class ServerErrorApplication : public PollingAppOfflineApplication
 
     HRESULT CreateHandler(IHttpContext *pHttpContext, IREQUEST_HANDLER ** pRequestHandler) override
     {
-        auto handler = std::make_unique<ServerErrorHandler>(*pHttpContext, 500ui16, 0ui16, "Internal Server Error", m_HR, m_moduleInstance, m_disableStartupPage, m_page, nullptr, 0);
+        auto handler = std::make_unique<ServerErrorHandler>(*pHttpContext, 500ui16, 0ui16, "Internal Server Error", m_HR, m_moduleInstance, m_disableStartupPage, m_page);
         *pRequestHandler = handler.release();
         return S_OK;
     }

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

@@ -37,15 +37,13 @@ class ServerErrorHandler : public REQUEST_HANDLER
 
     REQUEST_NOTIFICATION_STATUS ExecuteRequestHandler() override
     {
-        static std::string s_html500Page = GetHtml(m_moduleInstance, m_page);
-
-        WriteStaticResponse(m_pContext, s_html500Page, m_HR, m_disableStartupPage);
+        WriteStaticResponse(m_pContext, m_HR, m_disableStartupPage);
 
         return RQ_NOTIFICATION_FINISH_REQUEST;
     }
 
 private:
-    void WriteStaticResponse(IHttpContext& pContext, std::string& page, HRESULT hr, bool disableStartupErrorPage) const
+    void WriteStaticResponse(IHttpContext& pContext, HRESULT hr, bool disableStartupErrorPage) 
     {
         if (disableStartupErrorPage)
         {
@@ -70,8 +68,9 @@ class ServerErrorHandler : public REQUEST_HANDLER
         }
         else
         {
-            dataChunk.FromMemory.pBuffer = page.data();
-            dataChunk.FromMemory.BufferLength = static_cast<ULONG>(page.size());
+            static std::string s_html500Page = GetHtml(m_moduleInstance, m_page);
+            dataChunk.FromMemory.pBuffer = s_html500Page.data();
+            dataChunk.FromMemory.BufferLength = static_cast<ULONG>(s_html500Page.size());
         }
 
         pResponse->WriteEntityChunkByReference(&dataChunk);
@@ -119,6 +118,6 @@ class ServerErrorHandler : public REQUEST_HANDLER
     USHORT m_statusCode;
     USHORT m_subStatusCode;
     std::string m_statusText;
-    byte* m_ExceptionInfoContent;
+    BYTE* m_ExceptionInfoContent;
     int m_length;
 };

src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj

@@ -264,9 +264,6 @@
     <ResourceCompile Include="inprocessrequesthandler.rc" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="InProcessRhExceptionPage.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
     <None Include="InProcessRhStaticHtml.htm">
       <DeploymentContent>true</DeploymentContent>
     </None>

src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/StartupExceptionApplication.h

@@ -29,16 +29,9 @@ class StartupExceptionApplication : public InProcessApplicationBase
 
     ~StartupExceptionApplication() = default;
 
-    HRESULT CreateHandler(IHttpContext *pHttpContext, IREQUEST_HANDLER ** pRequestHandler)
+    HRESULT CreateHandler(IHttpContext* pHttpContext, IREQUEST_HANDLER** pRequestHandler)
     {
-        if (m_length > 0)
-        {
-            *pRequestHandler = new ServerErrorHandler(*pHttpContext, 500, 30, "Internal Server Error", m_HR, m_moduleInstance, m_disableLogs, m_errorPageContent, m_length);
-        }
-        else
-        {
-            *pRequestHandler = new ServerErrorHandler(*pHttpContext, 500, 30, "Internal Server Error", m_HR, m_moduleInstance, m_disableLogs, IN_PROCESS_RH_STATIC_HTML);
-        }
+        *pRequestHandler = new ServerErrorHandler(*pHttpContext, 500, 30, "Internal Server Error", m_HR, m_moduleInstance, m_disableLogs, IN_PROCESS_RH_STATIC_HTML, m_errorPageContent, m_length);
 
         return S_OK;
     }

src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp

@@ -302,7 +302,7 @@ FORWARDING_HANDLER::ExecuteRequestHandler()
     }
     else if (fFailedToStartKestrel && !m_pApplication->QueryConfig()->QueryDisableStartUpErrorPage())
     {
-        ServerErrorHandler handler(*m_pW3Context, 502, 5, "Bad Gateway", hr, g_hOutOfProcessRHModule, m_pApplication->QueryConfig()->QueryDisableStartUpErrorPage(), OUT_OF_PROCESS_RH_STATIC_HTML, nullptr, 0);
+        ServerErrorHandler handler(*m_pW3Context, 502, 5, "Bad Gateway", hr, g_hOutOfProcessRHModule, m_pApplication->QueryConfig()->QueryDisableStartUpErrorPage(), OUT_OF_PROCESS_RH_STATIC_HTML);
         handler.ExecuteRequestHandler();
     }
     else

src/Servers/IIS/IIS/src/NativeMethods.cs

@@ -300,7 +300,7 @@ public static void HttpGetAuthenticationInformation(IntPtr pInProcessHandler, ou
             Validate(http_get_authentication_information(pInProcessHandler, out authType, out token));
         }
 
-        public static unsafe void HttpSetStartupErrorPageContent(byte[] content)
+        internal static unsafe void HttpSetStartupErrorPageContent(byte[] content)
         {
             fixed(byte* bytePtr = content)
             {