Skip to content

Check if buffering is still happening before flushing #522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 6, 2024
Merged

Check if buffering is still happening before flushing #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da56eeb
Check if buffering is still happening before flushing
twsouthwick Jul 23, 2024
c65f2ac
Merge branch 'main' into tasou/check-if-buffering
twsouthwick Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/RegisterAdapterFeaturesMiddleware.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ public async Task InvokeAsync(HttpContextCore context)
}
finally
{
await context.Features.GetRequiredFeature<IHttpResponseBufferingFeature>().FlushAsync();
// The buffering feature may be removed if the response has ended i.e in usage with YARP
if (context.Features.Get<IHttpResponseBufferingFeature>() is { } buffer)
{
await buffer.FlushAsync();
}
}
}
}
Expand Down
12 changes: 12 additions & 0 deletions test/Microsoft.AspNetCore.SystemWebAdapters.CoreServices.Tests/ResponseStreamTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,18 @@ public async Task BufferingCanBeDisabledAndFlushesUsingPipe()
Assert.Equal("before after", result);
}

[Fact]
public async Task BufferIsNotFlushedIfNotAvailable()
{
var result = await RunAsync(middleware: (ctx, next) =>
{
ctx.Features.Set<IHttpResponseBufferingFeature>(null);
return next(ctx);
});

Assert.Equal(string.Empty, result);
}

private static Task<string> RunAsync(Action<HttpContext> action, Action<IEndpointConventionBuilder>? builder = null, Func<Http.HttpContext, RequestDelegate, Task>? middleware = null)
=> RunAsync(ctx =>
{
Expand Down