From eb694ab14702d9ca683f5ed15ada4ab2f0bda7b9 Mon Sep 17 00:00:00 2001
From: Chris Ross <chrross@microsoft.com>
Date: Tue, 5 Apr 2022 15:58:37 -0700
Subject: [PATCH] Support falling back to ConnectionId when RawConnectionId is
 0 on HTTP.sys (#40760)

---
 src/Servers/HttpSys/src/RequestProcessing/Request.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Servers/HttpSys/src/RequestProcessing/Request.cs b/src/Servers/HttpSys/src/RequestProcessing/Request.cs
index ffffc050672..880beebf562 100644
--- a/src/Servers/HttpSys/src/RequestProcessing/Request.cs
+++ b/src/Servers/HttpSys/src/RequestProcessing/Request.cs
@@ -120,7 +120,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
         internal ulong RawConnectionId { get; }
 
         // No ulongs in public APIs...
-        public long ConnectionId => (long)RawConnectionId;
+        public long ConnectionId => RawConnectionId != 0 ? (long)RawConnectionId : (long)UConnectionId;
 
         internal ulong RequestId { get; }
 
-- 
GitLab