Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.7.x' into 3.0.x

Browse Source 
Closes gh-38196
This commit is contained in:
Moritz Halbritter 2023-11-03 12:28:11 +01:00
commit 6b69525291
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

@ -332,7 +332,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

@ -704,7 +704,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) {