This is an automated email from the ASF dual-hosted git repository.
rmaucher pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 3d0d0f935e Update documentation for the switch to 25 for FFM
3d0d0f935e is described below
commit 3d0d0f935e1f3fe68e3f84448852f7486f5613af
Author: remm <[email protected]>
AuthorDate: Tue Sep 22 11:19:32 2026 +0200
Update documentation for the switch to 25 for FFM
There were explicit mentions of Java 22.
---
webapps/docs/config/http.xml | 32 ++++++++++++++++++++++++++++++--
webapps/docs/config/listeners.xml | 2 +-
webapps/docs/ssl-howto.xml | 4 ++--
3 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 5315bc0408..119883db87 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -409,6 +409,34 @@
comma-separated list of header names.</p>
</attribute>
+ <attribute name="altService" required="false">
+ <p>The protocol identifier of an alternative service that is announced
+ to clients in the <code>Alt-Svc</code> response header as described by
+ <a href="https://tools.ietf.org/rfc/rfc9239.txt";>RFC 9239</a>. This
+ allows clients to discover the alternative service from the first
+ response without any client-side configuration.
+ The value is used as the alternative service protocol identifier and
+ must therefore be a valid HTTP token as defined by
+ <a href="https://tools.ietf.org/rfc/rfc7230.txt";>RFC 7230</a>, for
+ example <code>h2</code>. If the value is not valid,
+ the connector fails to start.</p>
+
+ <p>The alternative service is assumed to be reachable at the same host
+ and port as this connector. The header value is generated from the
+ protocol identifier and the port on which the request was received and
+ takes a form such as <code>Alt-Svc: h2=":8443"</code>.</p>
+
+ <p>If this attribute is not set, no <code>Alt-Svc</code> header is
+ added by Tomcat. If a web application sets its own
+ <code>Alt-Svc</code> header for a response, the application provided
+ value is used and this attribute is ignored for that response.</p>
+
+ <p>The header is added to HTTP/1.1 responses and to HTTP/2 responses
+ served via the HTTP/2
+ <a href="http2.html">UpgradeProtocol</a> associated with this
+ connector.</p>
+ </attribute>
+
<attribute name="bindOnInit" required="false">
<p>Controls when the socket used by the connector is bound. If set to
<code>true</code> it is bound when the connector is initiated and unbound
@@ -1700,7 +1728,7 @@
<p>When OpenSSL FFM support is enabled, the connectors will default to using
OpenSSL through JSSE, which is equivalent but uses the Java FFM API from
- Java 22 to access OpenSSL.</p>
+ Java 25 to access OpenSSL.</p>
<p>The following NIO SSL configuration attributes are not specific to
a virtual host and, therefore, must be configured on the connector.</p>
@@ -1731,7 +1759,7 @@
will automatically enable it and the default value of this attribute
becomes
<code>org.apache.tomcat.util.net.openssl.OpenSSLImplementation</code>.
- The FFM API from Java 22 may also be used to enable OpenSSL support, in
+ The FFM API from Java 25 may also be used to enable OpenSSL support, in
which case the default value of the attribute becomes
<code>org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation</code>.
In that case, the attributes from either JSSE and OpenSSL
diff --git a/webapps/docs/config/listeners.xml
b/webapps/docs/config/listeners.xml
index 5a7364b161..340e1e4600 100644
--- a/webapps/docs/config/listeners.xml
+++ b/webapps/docs/config/listeners.xml
@@ -299,7 +299,7 @@
<p>The <strong>OpenSSL Lifecycle Listener</strong> checks for the presence
of the OpenSSL library and loads the library if it is present. This
- uses the FFM API from Java 22 instead of additional native code. When
+ uses the FFM API from Java 25 instead of additional native code. When
enabled and successfully loaded, the NIO connector will then make use
of OpenSSL for TLS functionality. This is a functional replacement to the
<strong>APR Lifecycle Listener</strong> described above.</p>
diff --git a/webapps/docs/ssl-howto.xml b/webapps/docs/ssl-howto.xml
index 8ef5c0dad7..626b475b66 100644
--- a/webapps/docs/ssl-howto.xml
+++ b/webapps/docs/ssl-howto.xml
@@ -275,7 +275,7 @@ loaded or not, use one of the following:</p>
port="8443" .../>]]></source>
<p>The OpenSSL JSSE implementation can also be configured explicitly if needed.
-If the Tomcat Native library or Java 22 is installed, using the
+If the Tomcat Native library or Java 25 is installed, using the
<code>sslImplementationName</code>
attribute allows enabling it. When using the OpenSSL JSSE implementation, the
configuration can use either the JSSE attributes or the OpenSSL attributes, but
@@ -466,7 +466,7 @@ configurations.</p>
configuration.</li>
<li>NIO HTTP connector with the
<code>org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation</code>,
- and using the OpenSSL style configuration. This uses FFM so Java 22 or
+ and using the OpenSSL style configuration. This uses FFM so Java 25 or
later is also required.</li>
</ul>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
