This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new c2265ce Expand the documentation for the address attribute for AJP
c2265ce is described below
commit c2265ce120868f910602bf9efa8f70f808f89c47
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 | 8 ++++++++
webapps/docs/config/ajp.xml | 12 +++++++++---
webapps/docs/config/http.xml | 13 +++++++++----
3 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index edd80b1..cae5397 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -116,6 +116,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Web applications">
+ <changelog>
+ <add>
+ Expand the documentation for the <code>address</code> attribute of the
+ AJP Connector. (markt)
+ </add>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<add>
diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml
index 80e473d..61362da 100644
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -304,9 +304,15 @@
</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
+ (BIO, NIO) 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 the equivalent
+ IPv4 address if present when configured with <code>::</code>.</p>
</attribute>
<attribute name="allowedRequestAttributesPattern" required="false">
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 9a95902..0195637 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -308,10 +308,15 @@
</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, this port will be used on all IP addresses
- associated with the server.</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 all local addresses. Unless the JVM is
+ configured otherwise using system properties, the Java based connectors
+ (BIO, NIO) 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 the equivalent
+ IPv4 address if present when configured with <code>::</code>.</p>
</attribute>
<attribute name="allowHostHeaderMismatch" required="false">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
