From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 4 Apr 2010 10:25:56 +0000 (+0000)
Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48983
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=de0b35b48f6248bc39cb298c0ddd1da63b49f41c;p=tomcat7.0

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48983
Additional debug logging for when RemoteIp(Valve|Filter) is not invoked

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@930657 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/.classpath b/.classpath
index fd029530b..2175b668c 100644
--- a/.classpath
+++ b/.classpath
@@ -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"/>
diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java b/java/org/apache/catalina/filters/RemoteIpFilter.java
index e54a5effa..b6f9dfc3a 100644
--- a/java/org/apache/catalina/filters/RemoteIpFilter.java
+++ b/java/org/apache/catalina/filters/RemoteIpFilter.java
@@ -789,6 +789,10 @@ public class RemoteIpFilter implements Filter {
             }
             chain.doFilter(xRequest, response);
         } else {
+            if (log.isDebugEnabled()) {
+                log.debug("Skip RemoteIpFilter for request " + request.getRequestURI() + " with originalRemoteAddr '"
+                        + request.getRemoteAddr() + "'");
+            }
             chain.doFilter(request, response);
         }
         
diff --git a/java/org/apache/catalina/valves/RemoteIpValve.java b/java/org/apache/catalina/valves/RemoteIpValve.java
index 795693b89..7c0c25856 100644
--- a/java/org/apache/catalina/valves/RemoteIpValve.java
+++ b/java/org/apache/catalina/valves/RemoteIpValve.java
@@ -627,6 +627,11 @@ public class RemoteIpValve extends ValveBase {
                           + 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);