diff --git a/src/Servers/Kestrel/Core/src/Middleware/Http3ConnectionMiddleware.cs b/src/Servers/Kestrel/Core/src/Middleware/Http3ConnectionMiddleware.cs index c330a69ca6..dc4aa7b29a 100644 --- a/src/Servers/Kestrel/Core/src/Middleware/Http3ConnectionMiddleware.cs +++ b/src/Servers/Kestrel/Core/src/Middleware/Http3ConnectionMiddleware.cs @@ -31,7 +31,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal ConnectionContext = connectionContext, ServiceContext = _serviceContext, ConnectionFeatures = connectionContext.Features, - MemoryPool = memoryPoolFeature.MemoryPool, + MemoryPool = memoryPoolFeature?.MemoryPool ?? System.Buffers.MemoryPool.Shared, LocalEndPoint = connectionContext.LocalEndPoint as IPEndPoint, RemoteEndPoint = connectionContext.RemoteEndPoint as IPEndPoint }; diff --git a/src/Servers/Kestrel/Core/src/Middleware/HttpConnectionMiddleware.cs b/src/Servers/Kestrel/Core/src/Middleware/HttpConnectionMiddleware.cs index 75445028e3..d5263f5c37 100644 --- a/src/Servers/Kestrel/Core/src/Middleware/HttpConnectionMiddleware.cs +++ b/src/Servers/Kestrel/Core/src/Middleware/HttpConnectionMiddleware.cs @@ -33,7 +33,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal Protocols = _protocols, ServiceContext = _serviceContext, ConnectionFeatures = connectionContext.Features, - MemoryPool = memoryPoolFeature.MemoryPool, + MemoryPool = memoryPoolFeature?.MemoryPool ?? System.Buffers.MemoryPool.Shared, Transport = connectionContext.Transport, LocalEndPoint = connectionContext.LocalEndPoint as IPEndPoint, RemoteEndPoint = connectionContext.RemoteEndPoint as IPEndPoint