Update

Author: JamesNK

src/Servers/Kestrel/Core/src/Internal/Http3/Http3Connection.cs

@@ -47,16 +47,6 @@ public Http3Connection(Http3ConnectionContext context)
             _context = context;
             _systemClock = context.ServiceContext.SystemClock;
 
-            if (_context.TimeoutControl == null)
-            {
-                var timeoutControl = new TimeoutControl(this);
-
-                // Ensure TimeoutControl._lastTimestamp is initialized before anything that could set timeouts runs.
-                timeoutControl.Initialize(_systemClock.UtcNowTicks);
-
-                _context.TimeoutControl = timeoutControl;
-            }
-
             _errorCodeFeature = context.ConnectionFeatures.Get<IProtocolErrorCodeFeature>()!;
 
             var httpLimits = context.ServiceContext.ServerOptions.Limits;
@@ -80,7 +70,6 @@ internal long HighestStreamId
             }
         }
 
-        public ITimeoutControl TimeoutControl => _context.TimeoutControl!;
         private IKestrelTrace Log => _context.ServiceContext.Log;
         public KestrelServerLimits Limits => _context.ServiceContext.ServerOptions.Limits;
         public Http3ControlStream? OutboundControlStream { get; set; }
@@ -215,8 +204,6 @@ public void Tick()
                 }
             }
 
-            TimeoutControl.Tick(now);
-
             // TODO cancel process stream loop to update logic.
         }
 
@@ -293,7 +280,7 @@ internal async Task InnerProcessStreamsAsync<TContext>(IHttpApplication<TContext
                             streamContext.Transport,
                             streamContext,
                             _serverSettings);
-                        httpConnectionContext.TimeoutControl = _context.TimeoutControl!;
+                        httpConnectionContext.TimeoutControl = CreateStreamTimeout();
 
                         if (!quicStreamFeature.CanWrite)
                         {
@@ -457,13 +444,26 @@ private async ValueTask<Http3ControlStream> CreateNewUnidirectionalStreamAsync<T
                 streamContext.Transport,
                 streamContext,
                 _serverSettings);
-
-            // Each HTTP/3 stream has its own transport. Create timeout control per stream.
-            httpConnectionContext.TimeoutControl = new TimeoutControl(this);
+            httpConnectionContext.TimeoutControl = CreateStreamTimeout();
 
             return new Http3ControlStream<TContext>(application, this, httpConnectionContext);
         }
 
+        private ITimeoutControl CreateStreamTimeout()
+        {
+            // Each HTTP/3 stream has its own transport. Create timeout control per stream.
+            if (_context.TimeoutControlCreator != null)
+            {
+                return _context.TimeoutControlCreator(this);
+            }
+            else
+            {
+                var timeoutControl = new TimeoutControl(this);
+                timeoutControl.Initialize(_systemClock.UtcNowTicks);
+                return timeoutControl;
+            }
+        }
+
         private ValueTask<FlushResult> SendGoAway(long id)
         {
             lock (_sync)

src/Servers/Kestrel/Core/src/Internal/Http3ConnectionContext.cs

@@ -1,10 +1,12 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Buffers;
 using System.Net;
 using Microsoft.AspNetCore.Connections.Experimental;
 using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http3;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal
@@ -38,8 +40,8 @@ public Http3ConnectionContext(
         public IPEndPoint? RemoteEndPoint { get; }
 
         /// <summary>
-        /// Will be be set by unit tests or created by Http3Connection ctor.
+        /// Will be be set by unit tests. If not set, default TimeoutControl is created.
         /// </summary>
-        public ITimeoutControl? TimeoutControl { get; set; }
+        public Func<Http3Connection, ITimeoutControl>? TimeoutControlCreator { get; set; }
     }
 }

src/Servers/Kestrel/shared/test/TestContextFactory.cs

@@ -79,8 +79,7 @@ public static Http3ConnectionContext CreateHttp3ConnectionContext(
             IFeatureCollection connectionFeatures = null,
             MemoryPool<byte> memoryPool = null,
             IPEndPoint localEndPoint = null,
-            IPEndPoint remoteEndPoint = null,
-            ITimeoutControl timeoutControl = null)
+            IPEndPoint remoteEndPoint = null)
         {
             var http3ConnectionContext = new Http3ConnectionContext(
                 "TestConnectionId",
@@ -90,7 +89,6 @@ public static Http3ConnectionContext CreateHttp3ConnectionContext(
                 memoryPool ?? PinnedBlockMemoryPoolFactory.Create(),
                 localEndPoint,
                 remoteEndPoint);
-            http3ConnectionContext.TimeoutControl = timeoutControl;
 
             return http3ConnectionContext;
         }

src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3TestBase.cs

@@ -221,7 +221,7 @@ protected void CreateConnection()
                 memoryPool: _memoryPool,
                 localEndPoint: null,
                 remoteEndPoint: null);
-            httpConnectionContext.TimeoutControl = _mockTimeoutControl.Object;
+            httpConnectionContext.TimeoutControlCreator = c => _mockTimeoutControl.Object;
 
             Connection = new Http3Connection(httpConnectionContext);
             _mockTimeoutHandler.Setup(h => h.OnTimeout(It.IsAny<TimeoutReason>()))

src/Servers/Kestrel/test/InMemory.FunctionalTests/Http3/Http3TimeoutTests.cs

@@ -5,6 +5,7 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
+using Microsoft.AspNetCore.Testing;
 using Moq;
 using Xunit;
 
@@ -27,14 +28,14 @@ public async Task HEADERS_IncompleteFrameReceivedWithinRequestHeadersTimeout_Abo
 
             _timeoutControl.Initialize(mockSystemClock.UtcNow.Ticks);
 
-            var requestStream = await InitializeConnectionAndStreamsAsync(_noopApplication);
+            var requestStream = await InitializeConnectionAndStreamsAsync(_noopApplication).DefaultTimeout();
 
-            var controlStream = await GetInboundControlStream();
-            await controlStream.ExpectSettingsAsync();
+            var controlStream = await GetInboundControlStream().DefaultTimeout();
+            await controlStream.ExpectSettingsAsync().DefaultTimeout();
 
-            await timerStartedTcs.Task;
+            await timerStartedTcs.Task.DefaultTimeout();
 
-            await requestStream.SendHeadersPartialAsync();
+            await requestStream.SendHeadersPartialAsync().DefaultTimeout();
 
             AdvanceClock(limits.RequestHeadersTimeout + Heartbeat.Interval);
 
@@ -48,7 +49,7 @@ public async Task HEADERS_IncompleteFrameReceivedWithinRequestHeadersTimeout_Abo
                 ignoreNonGoAwayFrames: false,
                 expectedLastStreamId: 0,
                 expectedErrorCode: Http3ErrorCode.RequestRejected,
-                expectedErrorMessage: CoreStrings.BadRequest_RequestHeadersTimeout);
+                expectedErrorMessage: CoreStrings.BadRequest_RequestHeadersTimeout).DefaultTimeout();
 
             _mockTimeoutHandler.VerifyNoOtherCalls();
         }