Clean up

Author: JamesNK

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

@@ -40,7 +40,7 @@ internal class Http3Connection : IHttp3StreamLifetimeHandler, IRequestProcessor
         private int _stoppedAcceptingStreams;
         private bool _gracefulCloseStarted;
         private int _activeRequestCount;
-        private readonly CancellationTokenSource _serverCloseCts;
+        private readonly CancellationTokenSource _allRequestsCompleted;
         private readonly Http3PeerSettings _serverSettings = new Http3PeerSettings();
         private readonly Http3PeerSettings _clientSettings = new Http3PeerSettings();
         private readonly StreamCloseAwaitable _streamCompletionAwaitable = new StreamCloseAwaitable();
@@ -51,7 +51,7 @@ public Http3Connection(HttpMultiplexedConnectionContext context)
             _multiplexedContext = (MultiplexedConnectionContext)context.ConnectionContext;
             _context = context;
             _streamLifetimeHandler = this;
-            _serverCloseCts = new CancellationTokenSource();
+            _allRequestsCompleted = new CancellationTokenSource();
 
             _errorCodeFeature = context.ConnectionFeatures.Get<IProtocolErrorCodeFeature>()!;
 
@@ -237,7 +237,7 @@ public async Task ProcessRequestsAsync<TContext>(IHttpApplication<TContext> appl
 
                 while (true)
                 {
-                    var streamContext = await _multiplexedContext.AcceptAsync(_serverCloseCts.Token);
+                    var streamContext = await _multiplexedContext.AcceptAsync(_allRequestsCompleted.Token);
 
                     try
                     {
@@ -378,20 +378,14 @@ public async Task ProcessRequestsAsync<TContext>(IHttpApplication<TContext> appl
                 }
                 catch
                 {
-                    Abort(ResolveConnectionError(error), Http3ErrorCode.InternalError);
+                    Abort(connectionError, Http3ErrorCode.InternalError);
                     throw;
                 }
                 finally
                 {
                     Log.Http3ConnectionClosed(_context.ConnectionId, GetHighestStreamId());
                 }
             }
-
-            static ConnectionAbortedException ResolveConnectionError(Exception? error)
-            {
-                return error as ConnectionAbortedException
-                    ?? new ConnectionAbortedException(CoreStrings.Http3ConnectionFaulted, error!);
-            }
         }
 
         private Http3StreamContext CreateHttpStreamContext(ConnectionContext streamContext)
@@ -583,9 +577,14 @@ void IHttp3StreamLifetimeHandler.OnStreamCompleted(IHttp3Stream stream)
                 }
                 _streams.Remove(stream.StreamId);
 
-                if (_gracefulCloseStarted)
+                if (stream.IsRequestStream)
                 {
-                    _serverCloseCts.Cancel();
+                    // Connection is gracefully closing and this is the final request.
+                    // Trigger cancellation token to cause AcceptAsync to exit.
+                    if (_gracefulCloseStarted && _activeRequestCount == 0)
+                    {
+                        _allRequestsCompleted.Cancel();
+                    }
                 }
             }
 

src/Servers/Kestrel/test/Interop.FunctionalTests/Http3/Http3RequestTests.cs

@@ -1148,12 +1148,12 @@ private IHostBuilder CreateHostBuilder(RequestDelegate requestDelegate, HttpProt
                 .ConfigureServices(AddTestLogging)
                 .ConfigureHostOptions(o =>
                 {
-                    //if (Debugger.IsAttached)
-                    //{
-                    //    // Avoid timeout while debugging.
-                    //    o.ShutdownTimeout = TimeSpan.FromHours(1);
-                    //}
-                    //else
+                    if (Debugger.IsAttached)
+                    {
+                        // Avoid timeout while debugging.
+                        o.ShutdownTimeout = TimeSpan.FromHours(1);
+                    }
+                    else
                     {
                         o.ShutdownTimeout = TimeSpan.FromSeconds(1);
                     }