Use ProduceEnd

Author: Tratcher

src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.cs

@@ -635,6 +635,15 @@ private async Task ProcessRequests<TContext>(IHttpApplication<TContext> applicat
                     // Run the application code for this request
                     await application.ProcessRequestAsync(context);
 
+                    // Trigger OnStarting if it hasn't been called yet and the app hasn't
+                    // already failed. If an OnStarting callback throws we can go through
+                    // our normal error handling in ProduceEnd.
+                    // https://github.com/aspnet/KestrelHttpServer/issues/43
+                    if (!HasResponseStarted && _applicationException == null && _onStarting?.Count > 0)
+                    {
+                        await FireOnStarting();
+                    }
+
                     if (!_connectionAborted && !VerifyResponseContentLength(out var lengthException))
                     {
                         ReportApplicationError(lengthException);
@@ -655,15 +664,6 @@ private async Task ProcessRequests<TContext>(IHttpApplication<TContext> applicat
 
                 KestrelEventSource.Log.RequestStop(this);
 
-                // Trigger OnStarting if it hasn't been called yet and the app hasn't
-                // already failed. If an OnStarting callback throws we can go through
-                // our normal error handling in ProduceEnd.
-                // https://github.com/aspnet/KestrelHttpServer/issues/43
-                if (!HasResponseStarted && _applicationException == null && _onStarting?.Count > 0)
-                {
-                    await FireOnStarting();
-                }
-
                 // At this point all user code that needs use to the request or response streams has completed.
                 // Using these streams in the OnCompleted callback is not allowed.
                 StopBodies();
@@ -942,7 +942,7 @@ public void ProduceContinue()
             }
         }
 
-        public Task InitializeResponseAsync(int firstWriteByteCount, bool appCompleted = false)
+        public Task InitializeResponseAsync(int firstWriteByteCount)
         {
             var startingTask = FireOnStarting();
             // If return is Task.CompletedTask no awaiting is required
@@ -953,7 +953,7 @@ public Task InitializeResponseAsync(int firstWriteByteCount, bool appCompleted =
 
             VerifyInitializeState(firstWriteByteCount);
 
-            ProduceStart(appCompleted: appCompleted);
+            ProduceStart(appCompleted: false);
 
             return Task.CompletedTask;
         }
@@ -1050,7 +1050,7 @@ protected Task ProduceEnd()
             return WriteSuffix();
         }
 
-        protected Task WriteSuffix()
+        private Task WriteSuffix()
         {
             if (HasResponseCompleted)
             {

src/Servers/Kestrel/Core/src/Internal/Http2/Http2Stream.FeatureCollection.cs

@@ -59,12 +59,7 @@ async Task IHttpResponseCompletionFeature.CompleteAsync()
             // Finalize headers
             if (!HasResponseStarted)
             {
-                if (!VerifyResponseContentLength(out var lengthException))
-                {
-                    throw lengthException;
-                }
-
-                await InitializeResponseAsync(0, appCompleted: true);
+                await FireOnStarting();
             }
 
             // Flush headers, body, trailers...
@@ -75,7 +70,7 @@ async Task IHttpResponseCompletionFeature.CompleteAsync()
                     throw lengthException;
                 }
 
-                await WriteSuffix();
+                await ProduceEnd();
             }
         }
     }

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

@@ -3484,7 +3484,7 @@ await InitializeConnectionAsync(async context =>
                     var ex = await Assert.ThrowsAsync<InvalidOperationException>(() => completionFeature.CompleteAsync().DefaultTimeout());
                     Assert.Equal(CoreStrings.FormatTooFewBytesWritten(0, 25), ex.Message);
 
-                    Assert.False(startingTcs.Task.IsCompleted); // OnStarting did not get called.
+                    Assert.True(startingTcs.Task.IsCompletedSuccessfully);
                     Assert.False(context.Response.Headers.IsReadOnly);
                     Assert.False(context.Features.Get<IHttpResponseTrailersFeature>().Trailers.IsReadOnly);