Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.1.x' into 6.2.x

This commit is contained in:
Marcus Hert Da Coregio 2024-01-31 09:51:51 -03:00
parent 3b615c8c6d 49f447f3d0
commit df46169e94
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTING.adoc
View File

@ -79,7 +79,7 @@ See https://github.com/spring-projects/spring-security/tree/main#building-from-s
The wiki pages https://github.com/spring-projects/spring-framework/wiki/Code-Style[Code Style] and https://github.com/spring-projects/spring-framework/wiki/IntelliJ-IDEA-Editor-Settings[IntelliJ IDEA Editor Settings] define the source file coding standards we use along with some IDEA editor settings we customize. The wiki pages https://github.com/spring-projects/spring-framework/wiki/Code-Style[Code Style] and https://github.com/spring-projects/spring-framework/wiki/IntelliJ-IDEA-Editor-Settings[IntelliJ IDEA Editor Settings] define the source file coding standards we use along with some IDEA editor settings we customize.
To format the code as well as check the style, run `./gradle format check`. To format the code as well as check the style, run `./gradlew format check`.
[[submit-a-pull-request]] [[submit-a-pull-request]]
=== Submit a Pull Request === Submit a Pull Request

2
docs/modules/ROOT/pages/servlet/authentication/passwords/ldap.adoc
View File

@ -614,7 +614,7 @@ You need only supply the domain name and an LDAP URL that supplies the address o
[NOTE] [NOTE]
==== ====
It is also possible to obtain the server's IP address byusing a DNS lookup. It is also possible to obtain the server's IP address by using a DNS lookup.
This is not currently supported, but hopefully will be in a future version. This is not currently supported, but hopefully will be in a future version.
==== ====

2
docs/modules/ROOT/pages/servlet/authentication/session-management.adoc
View File

@ -788,7 +788,7 @@ Java::
@Bean @Bean
public SecurityFilterChain filterChain(HttpSecurity http) { public SecurityFilterChain filterChain(HttpSecurity http) {
http http
.sessionManagement((session) - session .sessionManagement((session) -> session
.sessionFixation((sessionFixation) -> sessionFixation .sessionFixation((sessionFixation) -> sessionFixation
.newSession() .newSession()
) )