Merge branch '5.8.x' into 6.1.x

Closes gh-14681
This commit is contained in:
Josh Cummings 2024-03-04 15:42:35 -07:00
commit 0ab9ad774d
No known key found for this signature in database
GPG Key ID: A306A51F43B8E5A5

View File

@ -20,7 +20,7 @@ Java::
@Bean @Bean
SecurityWebFilterChain http(ServerHttpSecurity http) throws Exception { SecurityWebFilterChain http(ServerHttpSecurity http) throws Exception {
DelegatingServerLogoutHandler logoutHandler = new DelegatingServerLogoutHandler( DelegatingServerLogoutHandler logoutHandler = new DelegatingServerLogoutHandler(
new WebSessionServerLogoutHandler(), new SecurityContextServerLogoutHandler() new SecurityContextServerLogoutHandler(), new WebSessionServerLogoutHandler()
); );
http http
@ -38,7 +38,7 @@ Kotlin::
@Bean @Bean
fun http(http: ServerHttpSecurity): SecurityWebFilterChain { fun http(http: ServerHttpSecurity): SecurityWebFilterChain {
val customLogoutHandler = DelegatingServerLogoutHandler( val customLogoutHandler = DelegatingServerLogoutHandler(
WebSessionServerLogoutHandler(), SecurityContextServerLogoutHandler() SecurityContextServerLogoutHandler(), WebSessionServerLogoutHandler()
) )
return http { return http {