tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r930657 - in /tomcat/trunk: .classpath java/org/apache/catalina/filters/RemoteIpFilter.java java/org/apache/catalina/valves/RemoteIpValve.java
Date Sun, 04 Apr 2010 10:25:56 GMT
Author: markt
Date: Sun Apr  4 10:25:56 2010
New Revision: 930657

URL: http://svn.apache.org/viewvc?rev=930657&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48983
Additional debug logging for when RemoteIp(Valve|Filter) is not invoked

Modified:
    tomcat/trunk/.classpath
    tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
    tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java

Modified: tomcat/trunk/.classpath
URL: http://svn.apache.org/viewvc/tomcat/trunk/.classpath?rev=930657&r1=930656&r2=930657&view=diff
==============================================================================
--- tomcat/trunk/.classpath (original)
+++ tomcat/trunk/.classpath Sun Apr  4 10:25:56 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="java"/>
-	<classpathentry kind="src" path="test"/>
+	<classpathentry excluding="org/apache/catalina/tribes/|org/apache/catalina/valves/Benchmarks.java"
kind="src" path="test"/>
 	<classpathentry kind="src" path="webapps/examples/WEB-INF/classes"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>

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=930657&r1=930656&r2=930657&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Sun Apr  4 10:25:56
2010
@@ -789,6 +789,10 @@ public class RemoteIpFilter implements F
             }
             chain.doFilter(xRequest, response);
         } else {
+            if (log.isDebugEnabled()) {
+                log.debug("Skip RemoteIpFilter for request " + request.getRequestURI() +
" with originalRemoteAddr '"
+                        + request.getRemoteAddr() + "'");
+            }
             chain.doFilter(request, response);
         }
         

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=930657&r1=930656&r2=930657&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java Sun Apr  4 10:25:56 2010
@@ -627,6 +627,11 @@ public class RemoteIpValve extends Valve
                           + originalScheme + "' will be seen as newRemoteAddr='" + request.getRemoteAddr()
+ "', newRemoteHost='"
                           + request.getRemoteHost() + "', newScheme='" + request.getScheme()
+ "', newSecure='" + request.isSecure() + "'");
             }
+        } else {
+            if (log.isDebugEnabled()) {
+                log.debug("Skip RemoteIpValve for request " + request.getRequestURI() + "
with originalRemoteAddr '"
+                        + request.getRemoteAddr() + "'");
+            }
         }
         try {
             getNext().invoke(request, response);



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


Mime
View raw message