svn commit: r1498699 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/valves/RemoteIpValve.java webapps/docs/changelog.xml

[ma...@apache.org]

Author: markt
Date: Mon Jul  1 21:27:53 2013
New Revision: 1498699

URL: http://svn.apache.org/r1498699
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55179
Correct attribute name.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1498698

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?rev=1498699&r1=1498698&r2=1498699&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java Mon Jul  1 21:27:53 2013
@@ -97,7 +97,7 @@ import org.apache.juli.logging.LogFactor
  * <td>proxiesHeader</td>
  * <td>Name of the http header created by this valve to hold the list of proxies that have been processed in the incoming
  * <code>remoteIpHeader</code></td>
- * <td>RemoteIPProxiesHeader</td>
+ * <td>proxiesHeader</td>
  * <td>Compliant http header name</td>
  * <td>x-forwarded-by</td>
  * </tr>
@@ -165,7 +165,7 @@ import org.apache.juli.logging.LogFactor
  *   className="org.apache.catalina.valves.RemoteIpValve"
  *   internalProxies="192\.168\.0\.10|192\.168\.0\.11"
  *   remoteIpHeader="x-forwarded-for"
- *   remoteIpProxiesHeader="x-forwarded-by"
+ *   proxiesHeader="x-forwarded-by"
  *   protocolHeader="x-forwarded-proto"
  *   /&gt;</pre></code>
  * <p>
@@ -227,7 +227,7 @@ import org.apache.juli.logging.LogFactor
  *   className="org.apache.catalina.valves.RemoteIpValve"
  *   internalProxies="192\.168\.0\.10|192\.168\.0\.11"
  *   remoteIpHeader="x-forwarded-for"
- *   remoteIpProxiesHeader="x-forwarded-by"
+ *   proxiesHeader="x-forwarded-by"
  *   trustedProxies="proxy1|proxy2"
  *   /&gt;</pre></code>
  * <p>
@@ -269,7 +269,7 @@ import org.apache.juli.logging.LogFactor
  *   className="org.apache.catalina.valves.RemoteIpValve"
  *   internalProxies="192\.168\.0\.10|192\.168\.0\.11"
  *   remoteIpHeader="x-forwarded-for"
- *   remoteIpProxiesHeader="x-forwarded-by"
+ *   proxiesHeader="x-forwarded-by"
  *   trustedProxies="proxy1|proxy2"
  *   /&gt;</pre></code>
  * <p>
@@ -312,7 +312,7 @@ import org.apache.juli.logging.LogFactor
  *   className="org.apache.catalina.valves.RemoteIpValve"
  *   internalProxies="192\.168\.0\.10|192\.168\.0\.11"
  *   remoteIpHeader="x-forwarded-for"
- *   remoteIpProxiesHeader="x-forwarded-by"
+ *   proxiesHeader="x-forwarded-by"
  *   trustedProxies="proxy1|proxy2"
  *   /&gt;</pre></code>
  * <p>

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1498699&r1=1498698&r2=1498699&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jul  1 21:27:53 2013
@@ -187,6 +187,11 @@
         a <code>javax.mail.Authenticator</code> to mail sessions created via a
         JNDI resource. (markt)
       </add>
+      <fix>
+        <bug>55179</bug>: Correct the Javadoc for the remote IP valve so the
+        correct name is used to refer to the <code>proxiesHeader</code>
+        property. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="jdbc-pool">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org