Commit Graph
16 Commits
Author SHA1 Message Date
Andy Wilkinson c327a50325 Merge branch '4.0.x'
Closes gh-49312
2026-02-24 15:35:04 +00:00
Andy Wilkinson e808d7a7de Align server.tomcat.max-part-count default with Tomcat's default
Fixes gh-49311
2026-02-24 15:32:50 +00:00
Andy Wilkinson c9facf1b97 Upgrade to Tomcat 11.0.18
Tomcat 9.0.115, 10.1.52, and 11.0.18 include a breaking change [1] to
how ciphers are configured when using HTTPS. Previously, a single
setting was used but this has now been split in two; the existing
ciphers setting for TLSv1.2 ciphers and a new ciperSuites setting for
TLSv1.3. As part of this split, the behavior of the ciphers setting
has been changed such that any TLSv1.3 ciphers are ignored and a
warning is logged.

This change in Tomcat is problematic without also making some changes
in Boot. If we had done nothing, a user that had configured only
TLSv1.3 cipers would have them all ignored, leaving their SSL
connection unexpectedly using all of the default ciphers which may be
less secure.

This commit adapts to the breaking change in Tomcat by taking the
user's list of ciphers and splitting into into TLSv1.2 and TLSv1.3
ciphers before passing them into Tomcat's two settings (ciphers and
cipherSuites respectively). This is done defensively for backwards
compatibility. If the methods to identify and configure the TLSv1.3
ciphers are not present, we assume that we're running with an earlier
version of Tomcat and fall back to passing them all into the ciphers
setting as we did previously.

Closes gh-49143

[1] https://github.com/apache/tomcat/commit/9abf6bddb2e84ecf1668780bb3150b799f832ccf
2026-02-05 17:46:51 +00:00
Andy Wilkinson dfd4b85289 Upgrade to Tomcat 11.0.18
Tomcat 9.0.115, 10.1.52, and 11.0.18 include a breaking change [1] to
how ciphers are configured when using HTTPS. Previously, a single
setting was used but this has now been split in two; the existing
ciphers setting for TLSv1.2 ciphers and a new ciperSuites setting for
TLSv1.3. As part of this split, the behavior of the ciphers setting
has been changed such that any TLSv1.3 ciphers are ignored and a
warning is logged.

This change in Tomcat is problematic without also making some changes
in Boot. If we had done nothing, a user that had configured only
TLSv1.3 cipers would have them all ignored, leaving their SSL
connection unexpectedly using all of the default ciphers which may be
less secure.

This commit adapts to the breaking change in Tomcat by taking the
user's list of ciphers and splitting into into TLSv1.2 and TLSv1.3
ciphers before passing them into Tomcat's two settings (ciphers and
cipherSuites respectively). This is done defensively for backwards
compatibility. If the methods to identify and configure the TLSv1.3
ciphers are not present, we assume that we're running with an earlier
version of Tomcat and fall back to passing them all into the ciphers
setting as we did previously.

Closes gh-49108

[1] https://github.com/apache/tomcat/commit/9abf6bddb2e84ecf1668780bb3150b799f832ccf
2026-02-05 15:14:09 +00:00
Phillip Webb 0463b4d0bc Add @AutoConfigureWebServer test annotation
Introduce `@AutoConfigureWebServer` test annotation to support
`@SpringBootTest` with specific classes and a random port.

Closes gh-48815
2026-01-21 19:32:43 -08:00
Phillip Webb f73a809c8c Polish 2026-01-21 11:07:03 -08:00
Moritz Halbritter c9be84af6e Delete web server's temporary directories when the context is closed
Closes gh-9983
2026-01-20 10:16:54 +01:00
Andy Wilkinson c6cf8ba732 Upgrade to HttpClient5 5.6
Closes gh-48743
2026-01-09 09:54:21 +00:00
Andy Wilkinson 9bd1a460a1 Correct packaging of test code
Closes gh-48699
2026-01-08 11:43:43 +00:00
Andy Wilkinson 3becdc7d47 Move server.error properties to spring.web.error
Closes gh-48201
2025-11-20 11:55:23 +00:00
Moritz Halbritter 1b59d45621 Add nullability annotations to tests in module/spring-boot-tomcat
See gh-47263
2025-10-15 16:58:20 +02:00
Stéphane Nicoll c3e0e1b93d Upgrade to Tomcat 11.0.13
Closes gh-47589
2025-10-14 17:09:16 +02:00
Stéphane Nicoll 35bceeead2 Merge branch '3.5.x'
Closes gh-47254
2025-09-17 15:36:10 +02:00
Stéphane Nicoll aebecb3007 Polish contribution
See gh-47229
2025-09-17 15:04:35 +02:00
Kevin Zittritsch 2314d15430 Add configuration property for Tomcat's static resource cache max size
See gh-47229

Signed-off-by: Kevin Zittritsch <kevin.zittritsch@vtinfo.com>
2025-09-17 15:02:32 +02:00
Phillip Webb decc32dde3 Restructure project directories to better fit Gradle
Closes gh-46358
2025-07-10 17:54:08 -07:00