Browse Source

Merge branch '3.0.x' into 3.1.x

Closes gh-38197
pull/38706/head
Moritz Halbritter 2 years ago
parent
commit
fb1a4ba470
  1. 5
      spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactory.java
  2. 5
      spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java

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

@ -333,7 +333,10 @@ public class TomcatReactiveWebServerFactory extends AbstractReactiveWebServerFac @@ -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

@ -705,7 +705,10 @@ public class TomcatServletWebServerFactory extends AbstractServletWebServerFacto @@ -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) {

Loading…
Cancel
Save