Просмотр исходного кода

Remove misleading websocket error log (#7249)

Justin Kotalik 7 лет назад
Родитель
Сommit
07ef2d881f

+ 8 - 4
src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp

@@ -86,14 +86,18 @@ OUT_OF_PROCESS_APPLICATION::SetWebsocketStatus(
     // the websocket module may still not be enabled.
     PCWSTR pszTempWebsocketValue;
     DWORD cbLength;
-
-    if (FAILED_LOG(pHttpContext->GetServerVariable("WEBSOCKET_VERSION", &pszTempWebsocketValue, &cbLength)))
+    HRESULT hr = pHttpContext->GetServerVariable("WEBSOCKET_VERSION", &pszTempWebsocketValue, &cbLength);
+    if (SUCCEEDED(hr))
     {
-        m_fWebSocketSupported = WEBSOCKET_STATUS::WEBSOCKET_NOT_SUPPORTED;
+        m_fWebSocketSupported = WEBSOCKET_STATUS::WEBSOCKET_SUPPORTED;
     }
     else
     {
-        m_fWebSocketSupported = WEBSOCKET_STATUS::WEBSOCKET_SUPPORTED;
+        m_fWebSocketSupported = WEBSOCKET_STATUS::WEBSOCKET_NOT_SUPPORTED;
+        if (hr != HRESULT_FROM_WIN32(ERROR_INVALID_INDEX))
+        {
+            LOG_IF_FAILED(hr);
+        }
     }
 }