Skip to content

Commit

Permalink
Merge branch '2.7.x' into 3.0.x
Browse files Browse the repository at this point in the history
Closes gh-38196
  • Loading branch information
mhalbritter committed Nov 3, 2023
2 parents 8d53caa + 18f9dc9 commit 6b69525
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,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
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,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) {
Expand Down

0 comments on commit 6b69525

Please sign in to comment.