Author: kkolinko
Date: Tue Nov 22 16:28:38 2011
New Revision: 1205065
URL: http://svn.apache.org/viewvc?rev=1205065&view=rev
Log:
Correct request attribute names mentioned in RemoteIpFilter/RemoteIpValve
javadoc
and mention them in documentation.
Modified:
tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
tomcat/trunk/webapps/docs/config/filter.xml
tomcat/trunk/webapps/docs/config/valve.xml
Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java?rev=1205065&r1=1205064&r2=1205065&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Tue Nov
22 16:28:38 2011
@@ -1104,10 +1104,10 @@ public class RemoteIpFilter implements F
*
* The attributes set are:
* <ul>
- * <li>org.apache.catalina.RemoteAddr</li>
- * <li>org.apache.catalina.RemoteHost</li>
- * <li>org.apache.catalina.Protocol</li>
- * <li>org.apache.catalina.ServerPost</li>
+ * <li>org.apache.catalina.AccessLog.RemoteAddr</li>
+ * <li>org.apache.catalina.AccessLog.RemoteHost</li>
+ * <li>org.apache.catalina.AccessLog.Protocol</li>
+ * <li>org.apache.catalina.AccessLog.ServerPort</li>
* </ul>
*
* @param requestAttributesEnabled <code>true</code> causes the attributes
Modified: tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?rev=1205065&r1=1205064&r2=1205065&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java Tue Nov 22
16:28:38 2011
@@ -810,10 +810,10 @@ public class RemoteIpValve extends Valve
*
* The attributes set are:
* <ul>
- * <li>org.apache.catalina.RemoteAddr</li>
- * <li>org.apache.catalina.RemoteHost</li>
- * <li>org.apache.catalina.Protocol</li>
- * <li>org.apache.catalina.ServerPost</li>
+ * <li>org.apache.catalina.AccessLog.RemoteAddr</li>
+ * <li>org.apache.catalina.AccessLog.RemoteHost</li>
+ * <li>org.apache.catalina.AccessLog.Protocol</li>
+ * <li>org.apache.catalina.AccessLog.ServerPort</li>
* </ul>
*
* @param requestAttributesEnabled <code>true</code> causes the attributes
Modified: tomcat/trunk/webapps/docs/config/filter.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/filter.xml?rev=1205065&r1=1205064&r2=1205065&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/filter.xml (original)
+++ tomcat/trunk/webapps/docs/config/filter.xml Tue Nov 22 16:28:38 2011
@@ -700,6 +700,16 @@ FINE: Request "/docs/config/manager.html
<code>requestAttributesEnabled</code> attribute of
<code>AccessLogValve</code>.</p>
+ <p>The names of request attributes that are set by this filter
+ and can be used by access logging are the following:</p>
+
+ <ul>
+ <li><code>org.apache.catalina.AccessLog.RemoteAddr</code></li>
+ <li><code>org.apache.catalina.AccessLog.RemoteHost</code></li>
+ <li><code>org.apache.catalina.AccessLog.Protocol</code></li>
+ <li><code>org.apache.catalina.AccessLog.ServerPort</code></li>
+ </ul>
+
</subsection>
<subsection name="Filter Class Name">
Modified: tomcat/trunk/webapps/docs/config/valve.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/valve.xml?rev=1205065&r1=1205064&r2=1205065&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/valve.xml (original)
+++ tomcat/trunk/webapps/docs/config/valve.xml Tue Nov 22 16:28:38 2011
@@ -1262,6 +1262,16 @@
<code>requestAttributesEnabled</code> attribute of
<code>AccessLogValve</code>.</p>
+ <p>The names of request attributes that are set by this valve
+ and can be used by access logging are the following:</p>
+
+ <ul>
+ <li><code>org.apache.catalina.AccessLog.RemoteAddr</code></li>
+ <li><code>org.apache.catalina.AccessLog.RemoteHost</code></li>
+ <li><code>org.apache.catalina.AccessLog.Protocol</code></li>
+ <li><code>org.apache.catalina.AccessLog.ServerPort</code></li>
+ </ul>
+
</subsection>
<subsection name="Attributes">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
