This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new c4cffcf Expand the documentation for the address attribute for AJP
c4cffcf is described below
commit c4cffcf75840397b579e39e2d58512694f70f87e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Mar 5 08:58:59 2020 +0000
Expand the documentation for the address attribute for AJP
---
webapps/docs/changelog.xml | 10 ++++++++++
webapps/docs/config/ajp.xml | 20 +++++++++++++++++---
webapps/docs/config/http.xml | 2 +-
3 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d085848..e214a26 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -150,6 +150,16 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Web applications">
+ <changelog>
+ <add>
+ Expand the documentation for the <code>address</code> attribute of the
+ AJP Connector and document that the AJP Connector also supports the
+ <code>ipv6v6only</code> attribute with the APR/Native implementaiton.
+ (markt)
+ </add>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<update>
diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml
index 9a170df..f1405c5 100644
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -313,9 +313,16 @@
</attribute>
<attribute name="address" required="false">
- <p>For servers with more than one IP address, this attribute
- specifies which address will be used for listening on the specified
- port. By default, the loopback address will be used.</p>
+ <p>For servers with more than one IP address, this attribute specifies
+ which address will be used for listening on the specified port. By
+ default, the connector will listen on the loopback address. Unless the
JVM
+ is configured otherwise using system properties, the Java based
connectors
+ (NIO, NIO2) will listen on both IPv4 and IPv6 addresses when configured
+ with either <code>0.0.0.0</code> or <code>::</code>. The APR/native
+ connector will only listen on IPv4 addresses if configured with
+ <code>0.0.0.0</code> and will listen on IPv6 addresses (and optionally
+ IPv4 addresses depending on the setting of <strong>ipv6v6only</strong>)
if
+ configured with <code>::</code>.</p>
</attribute>
<attribute name="allowedRequestAttributesPattern" required="false">
@@ -786,6 +793,13 @@
addition to the common Connector and AJP attributes listed above.</p>
<attributes>
+ <attribute name="ipv6v6only" required="false">
+ <p>If listening on an IPv6 address on a dual stack system, should the
+ connector only listen on the IPv6 address? If not specified the default
+ is <code>false</code> and the connector will listen on the IPv6 address
+ and the equivalent IPv4 address if present.</p>
+ </attribute>
+
<attribute name="pollTime" required="false">
<p>Duration of a poll call in microseconds. Lowering this value will
slightly decrease latency of connections being kept alive in some cases
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index ca46da7..813998c 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -320,7 +320,7 @@
with either <code>0.0.0.0</code> or <code>::</code>. The APR/native
connector will only listen on IPv4 addresses if configured with
<code>0.0.0.0</code> and will listen on IPv6 addresses (and optionally
- IPv4 addresses depending on the setting of <strong>ipv6onlyv6</strong>)
if
+ IPv4 addresses depending on the setting of <strong>ipv6v6only</strong>)
if
configured with <code>::</code>.</p>
</attribute>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
