PR feedback

Author: JamesNK

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

@@ -224,16 +224,13 @@ private void UpdateStreamTimeouts(DateTimeOffset now)
 
                         if (stream.StreamTimeoutTicks == default)
                         {
-                            var expirationTicks = Math.Max(
-                                _context.TimeoutControl.GetWriteTimingTimeoutTimestamp(),
-                                ticks + minDataRate.GracePeriod.Ticks);
-
-                            stream.StreamTimeoutTicks = expirationTicks >= 0 ? expirationTicks : long.MaxValue;
+                            stream.StreamTimeoutTicks = _context.TimeoutControl.GetResponseDrainDeadline(ticks, minDataRate);
                         }
 
                         if (stream.StreamTimeoutTicks < ticks)
                         {
-                            stream.Abort(new ConnectionAbortedException(CoreStrings.ConnectionTimedBecauseResponseMininumDataRateNotSatisfied), Http3ErrorCode.RequestCancelled);
+                            // Cancel connection to be consistent with other data rate limits.
+                            Abort(new ConnectionAbortedException(CoreStrings.ConnectionTimedBecauseResponseMininumDataRateNotSatisfied), Http3ErrorCode.InternalError);
                         }
                     }
                 }
@@ -449,7 +446,7 @@ private ConnectionAbortedException CreateConnectionAbortError(Exception? error,
 
             if (clientAbort)
             {
-                return new ConnectionAbortedException("The client closed the HTTP/3 connection.", error!);
+                return new ConnectionAbortedException(CoreStrings.ConnectionAbortedByClient, error!);
             }
 
             return new ConnectionAbortedException(CoreStrings.Http3ConnectionFaulted, error!);

src/Servers/Kestrel/Core/src/Internal/Infrastructure/ITimeoutControl.cs

@@ -26,6 +26,6 @@ internal interface ITimeoutControl
         void StartTimingWrite();
         void StopTimingWrite();
         void BytesWrittenToBuffer(MinDataRate minRate, long count);
-        long GetWriteTimingTimeoutTimestamp();
+        long GetResponseDrainDeadline(long ticks, MinDataRate minRate);
     }
 }

src/Servers/Kestrel/Core/src/Internal/Infrastructure/TimeoutControl.cs

@@ -331,9 +331,11 @@ void IConnectionTimeoutFeature.ResetTimeout(TimeSpan timeSpan)
             ResetTimeout(timeSpan.Ticks, TimeoutReason.TimeoutFeature);
         }
 
-        public long GetWriteTimingTimeoutTimestamp()
+        public long GetResponseDrainDeadline(long ticks, MinDataRate minRate)
         {
-            return _writeTimingTimeoutTimestamp;
+            var timestamp = Math.Max(_writeTimingTimeoutTimestamp, ticks + minRate.GracePeriod.Ticks);
+
+            return timestamp >= 0 ? timestamp : long.MaxValue;
         }
     }
 }

src/Servers/Kestrel/perf/Microbenchmarks/Mocks/MockTimeoutControl.cs

@@ -24,7 +24,7 @@ public void CancelTimeout()
         {
         }
 
-        public long GetWriteTimingTimeoutTimestamp()
+        public long GetResponseDrainDeadline(long ticks, MinDataRate minRate)
         {
             return 0;
         }

src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2TestBase.cs

@@ -1385,9 +1385,9 @@ public virtual void Tick(DateTimeOffset now)
                 _realTimeoutControl.Tick(now);
             }
 
-            public long GetWriteTimingTimeoutTimestamp()
+            public long GetResponseDrainDeadline(long ticks, MinDataRate minRate)
             {
-                return _realTimeoutControl.GetWriteTimingTimeoutTimestamp();
+                return _realTimeoutControl.GetResponseDrainDeadline(ticks, minRate);
             }
         }
     }

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

@@ -270,10 +270,13 @@ await requestStream.SendHeadersAsync(new[]
 
             Http3Api.TriggerTick(now + limits.MinResponseDataRate.GracePeriod + TimeSpan.FromTicks(1));
 
-            await requestStream.WaitForStreamErrorAsync(
-                Http3ErrorCode.RequestCancelled,
-                AssertExpectedErrorMessages,
-                CoreStrings.ConnectionTimedBecauseResponseMininumDataRateNotSatisfied);
+            requestStream.StartStreamDisposeTcs.TrySetResult();
+
+            await Http3Api.WaitForConnectionErrorAsync<ConnectionAbortedException>(
+                ignoreNonGoAwayFrames: false,
+                expectedLastStreamId: 4,
+                Http3ErrorCode.InternalError,
+                expectedErrorMessage: CoreStrings.ConnectionTimedBecauseResponseMininumDataRateNotSatisfied);
         }
 
         private class EchoAppWithNotification

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

@@ -888,7 +888,7 @@ await WaitForLogAsync(logs =>
 
                     // This message says the client closed the connection because the server
                     // sends a GOAWAY and the client then closes the connection once all requests are finished.
-                    Assert.Contains("The client closed the HTTP/3 connection.", connectionAbortLog.Message);
+                    Assert.Contains("The client closed the connection.", connectionAbortLog.Message);
                     return true;
                 }, "Wait for connection abort.");