Merge branch '3.0.x' into 3.1.x

Closes gh-38197
spring-projects · Nov 3, 2023 · fb1a4ba · fb1a4ba
2 parents afa4d27 + 6b69525
commit fb1a4ba
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/...ain/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactory.java b/...ain/java/org/springframework/boot/web/embedded/tomcat/TomcatReactiveWebServerFactory.java
@@ -333,7 +333,10 @@ public Collection<TomcatProtocolHandlerCustomizer<?>> getTomcatProtocolHandlerCu
 	}
 
 	/**
-	 * 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
 	 */

diff --git a/...main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java b/...main/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactory.java
@@ -705,7 +705,10 @@ public Collection<TomcatProtocolHandlerCustomizer<?>> getTomcatProtocolHandlerCu
 	}
 
 	/**
-	 * 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) {