From 07ef2d881fc9ccbdeb8b4254fbb4a5f6d5664a59 Mon Sep 17 00:00:00 2001
From: Justin Kotalik <jukotali@microsoft.com>
Date: Thu, 7 Feb 2019 08:26:10 -0800
Subject: [PATCH] Remove misleading websocket error log (#7249)
---
.../outprocessapplication.cpp | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp
index 22d0da50c93..0a171e5f8d9 100644
--- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp
+++ b/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);
+ }
}
}
--
GitLab