Skip to content

Use default cancellation token on redirect #234

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
Oct 25, 2022
Merged

Use default cancellation token on redirect #234

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34abc78
Use default cancellation token on redirect
twsouthwick Oct 25, 2022
8dd1527
Use a minute timeout
twsouthwick Oct 25, 2022
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
7 changes: 6 additions & 1 deletion src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/SessionMiddleware.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Threading;
using System.Threading.Tasks;
using System.Web.SessionState;
using Microsoft.AspNetCore.Http;
Expand All @@ -22,6 +23,8 @@ internal partial class SessionMiddleware
[LoggerMessage(EventId = 1, Level = LogLevel.Warning, Message = "Creating session on demand by synchronously waiting on a potential asynchronous connection")]
private partial void LogOnDemand();

private readonly TimeSpan CommitTimeout = TimeSpan.FromMinutes(1);

public SessionMiddleware(RequestDelegate next, ILogger<SessionMiddleware> logger)
{
_next = next;
Expand Down Expand Up @@ -56,7 +59,9 @@ private async Task ManageStateAsync(HttpContextCore context, SessionAttribute me
try
{
await _next(context);
await state.CommitAsync(context.RequestAborted);

using var cts = new CancellationTokenSource(CommitTimeout);
await state.CommitAsync(cts.Token);
}
finally
{
Expand Down