This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 3096221 Fix BZ 65235. Correct docs. Expand MBean descriptor.
3096221 is described below
commit 30962215f8f6c1f3f24acf9826745a822379cbb3
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Apr 16 12:44:40 2021 +0100
Fix BZ 65235. Correct docs. Expand MBean descriptor.
---
.../apache/catalina/valves/mbeans-descriptors.xml | 48 ++++++++++++++--------
webapps/docs/changelog.xml | 12 ++++++
webapps/docs/config/valve.xml | 2 +-
3 files changed, 44 insertions(+), 18 deletions(-)
diff --git a/java/org/apache/catalina/valves/mbeans-descriptors.xml
b/java/org/apache/catalina/valves/mbeans-descriptors.xml
index 1fd880e..6290778 100644
--- a/java/org/apache/catalina/valves/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/valves/mbeans-descriptors.xml
@@ -527,44 +527,59 @@
type="org.apache.catalina.valves.RemoteIpValve">
<attribute name="asyncSupported"
- description="Does this valve support async reporting."
+ description="Does this valve support async processing"
+ is="true"
+ type="boolean"/>
+
+ <attribute name="changeLocalName"
+ description="If true the value returned by
ServletRequest.getLocalHost() and ServletRequest.getServerHost() is modified by
this Valve"
+ is="true"
+ type="boolean"/>
+
+ <attribute name="changeLocalPort"
+ description="If true the value returned by
ServletRequest.getLocalPort() and ServletRequest.getServerPort() is modified by
this Valve"
is="true"
type="boolean"/>
<attribute name="httpServerPort"
description="Value returned by ServletRequest.getServerPort()
when the protocolHeader indicates http protocol"
- type="java.lang.String"
- writeable="false" />
+ type="java.lang.String"/>
<attribute name="httpsServerPort"
description="Value returned by ServletRequest.getServerPort()
when the protocolHeader indicates https protocol"
- type="java.lang.String"
- writeable="false" />
+ type="java.lang.String"/>
+
+ <attribute name="hostHeader"
+ description="The host header (e.g.
"X-Forwarded-Host")"
+ type="java.lang.String"/>
<attribute name="internalProxies"
description="Regular expression that matches IP addresses of
internal proxies"
- type="java.lang.String"
- writeable="false" />
+ type="java.lang.String"/>
+
+ <attribute name="portHeader"
+ description="The protocol header (e.g.
"X-Forwarded-Port")"
+ type="java.lang.String"/>
<attribute name="protocolHeader"
description="The protocol header (e.g.
"X-Forwarded-Proto")"
- type="java.lang.String"
- writeable="false" />
+ type="java.lang.String"/>
<attribute name="protocolHeaderHttpsValue"
description="The value of the protocol header for incoming
https request (e.g. "https")"
- type="java.lang.String"
- writeable="false" />
+ type="java.lang.String"/>
<attribute name="proxiesHeader"
description="The proxies header name (e.g.
"X-Forwarded-By")"
- type="java.lang.String"
- writeable="false" />
+ type="java.lang.String"/>
<attribute name="remoteIpHeader"
description="The remote IP header name (e.g.
"X-Forwarded-For")"
- type="java.lang.String"
- writeable="false" />
+ type="java.lang.String"/>
+
+ <attribute name="requestAttributesEnabled"
+ description="If true, the Valve will set the request attributes
used by AccessLog implementations to override the values returned by the
request for remote address, remote host, server port and protocol"
+ type="boolean"/>
<attribute name="stateName"
description="The name of the LifecycleState that this component
is currently in"
@@ -573,8 +588,7 @@
<attribute name="trustedProxies"
description="Regular expression that matches IP addresses of
trusted proxies"
- type="java.lang.String"
- writeable="false" />
+ type="java.lang.String"/>
</mbean>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4472321..b754fa1 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -118,6 +118,10 @@
<bug>65224</bug>: Ensure the correct escaping of attribute values and
search filters in the JNDIRealm. (markt)
</fix>
+ <fix>
+ <bug>65235</bug>: Add missing attributes to the MBean descriptor file
+ for the <code>RemoteIpValve</code>. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
@@ -128,6 +132,14 @@
</scode>
</changelog>
</subsection>
+ <subsection name="Web applications">
+ <changelog>
+ <fix>
+ <bug>65235</bug>: Correct name of <code>changeLocalName</code> in the
+ documentation for the <code>RemoteIpValve</code>. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<fix>
diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml
index 4e0770f..e5aca90 100644
--- a/webapps/docs/config/valve.xml
+++ b/webapps/docs/config/valve.xml
@@ -1155,7 +1155,7 @@
specified, the default of <code>443</code> is used.</p>
</attribute>
- <attribute name="changeLocalHost" required="false">
+ <attribute name="changeLocalName" required="false">
<p>If <code>true</code>, the value returned by
<code>ServletRequest.getLocalHost()</code> and
<code>ServletRequest.getServerHost()</code> is modified by the this
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
