root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '3.0.x' into 3.1.x 

Closes gh-38197
This commit is contained in:
Moritz Halbritter 2023-11-03 12:28:22 +01:00
parent afa4d274c2 6b69525291
commit fb1a4ba470
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactory.java
View File

@ -333,7 +333,10 @@ public class TomcatReactiveWebServerFactory extends AbstractReactiveWebServerFac
}
/**
* Add {@link Connector}s in addition to the default connector, e.g. for SSL or AJP
* Add {@link Connector}s in addition to the default connector, e.g. for SSL or AJP.
* <p>
* {@link #getTomcatConnectorCustomizers Connector customizers} are not applied to
* connectors added this way.
* @param connectors the connectors to add
* @since 2.2.0
*/

5
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java
View File

@ -705,7 +705,10 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto
}
/**
* Add {@link Connector}s in addition to the default connector, e.g. for SSL or AJP
* Add {@link Connector}s in addition to the default connector, e.g. for SSL or AJP.
* <p>
* {@link #getTomcatConnectorCustomizers Connector customizers} are not applied to
* connectors added this way.
* @param connectors the connectors to add
*/
public void addAdditionalTomcatConnectors(Connector... connectors) {