From 36396a49cb40805f939d5fed0848bfbf26f6032e Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 8 May 2011 22:11:19 +0000
Subject: [PATCH] Fix Servlet TCK failures with using the RemoteIpValve

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1100825 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/valves/RemoteIpValve.java | 11 +++++++++++
 webapps/docs/changelog.xml                         |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/java/org/apache/catalina/valves/RemoteIpValve.java b/java/org/apache/catalina/valves/RemoteIpValve.java
index bb4b4e794..7b8a825ed 100644
--- a/java/org/apache/catalina/valves/RemoteIpValve.java
+++ b/java/org/apache/catalina/valves/RemoteIpValve.java
@@ -442,6 +442,17 @@ public class RemoteIpValve extends ValveBase {
      */
     private Pattern trustedProxies = null;
     
+
+    /**
+     * Default constructor that ensures {@link ValveBase#ValveBase(boolean)} is
+     * called with <code>true</code>.
+     */
+    public RemoteIpValve() {
+        // Async requests are supported with this valve
+        super(true);
+    }
+
+    
     public int getHttpsServerPort() {
         return httpsServerPort;
     }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2835db166..0465569e8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -53,6 +53,10 @@
         Ensure that the SSLValve provides the SSL key size as an Integer rather
         than a String. (markt)
       </fix>
+      <fix>
+        Ensure that the RemoteIpValve works correctly with Servlet 3.0
+        asynchronous requests. (markt)
+      </fix>
     </changelog>
   </subsection>
 </section>
-- 
2.11.0