Session commit should time out if request is aborted (#552)

twsouthwick · web-flow · commit 2018b8de673c · 2024-11-15T10:34:13.000-08:00
Currently, the session commit creates a time out solely on non-configurable value (which is currently set to 1 minute). This change links the request timeout so if a request is canceled, the commit will be canceled as well.
diff --git a/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/SessionMiddleware.cs b/src/Microsoft.AspNetCore.SystemWebAdapters.CoreServices/SessionMiddleware.cs
@@ -56,11 +56,12 @@ private async Task ManageStateAsync(HttpContextCore context, ISessionStateFeatur
         {
             await _next(context);
 
-            using var cts = new CancellationTokenSource(CommitTimeout);
-
             if (!details.IsReadOnly)
             {
-                await state.CommitAsync(cts.Token);
+                using var cts = new CancellationTokenSource(CommitTimeout);
+                using var linked = CancellationTokenSource.CreateLinkedTokenSource(cts.Token, context.RequestAborted);
+
+                await state.CommitAsync(linked.Token);
             }
         }
         finally

Original file line number	Diff line number	Diff line change
`@@ -56,11 +56,12 @@ private async Task ManageStateAsync(HttpContextCore context, ISessionStateFeatur`
`56`	`56`	`{`
`57`	`57`	`await _next(context);`
`58`	`58`
`59`		`- using var cts = new CancellationTokenSource(CommitTimeout);`
`60`		`-`
`61`	`59`	`if (!details.IsReadOnly)`
`62`	`60`	`{`
`63`		`- await state.CommitAsync(cts.Token);`
	`61`	`+ using var cts = new CancellationTokenSource(CommitTimeout);`
	`62`	`+ using var linked = CancellationTokenSource.CreateLinkedTokenSource(cts.Token, context.RequestAborted);`
	`63`	`+`
	`64`	`+ await state.CommitAsync(linked.Token);`
`64`	`65`	`}`
`65`	`66`	`}`
`66`	`67`	`finally`