From 6e38087caa1b808801631ce2ddea563bb1549c92 Mon Sep 17 00:00:00 2001 From: markt Date: Sat, 19 Jun 2010 09:41:35 +0000 Subject: [PATCH] Fix Gump failure git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@956209 13f79535-47bb-0310-9956-ffa450edef68 --- test/org/apache/catalina/filters/TestRemoteIpFilter.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/org/apache/catalina/filters/TestRemoteIpFilter.java b/test/org/apache/catalina/filters/TestRemoteIpFilter.java index d0c339c9f..b7fbe0ab2 100644 --- a/test/org/apache/catalina/filters/TestRemoteIpFilter.java +++ b/test/org/apache/catalina/filters/TestRemoteIpFilter.java @@ -148,7 +148,7 @@ public class TestRemoteIpFilter extends TomcatBaseTest { // PREPARE FilterDef filterDef = new FilterDef(); filterDef.addInitParameter("protocolHeader", "x-forwarded-proto"); - filterDef.addInitParameter("remoteIPHeader", "x-my-forwarded-for"); + filterDef.addInitParameter("remoteIpHeader", "x-my-forwarded-for"); filterDef.addInitParameter("httpServerPort", "8080"); MockHttpServletRequest request = new MockHttpServletRequest(); @@ -213,7 +213,7 @@ public class TestRemoteIpFilter extends TomcatBaseTest { FilterDef filterDef = new FilterDef(); filterDef.addInitParameter("internalProxies", "192\\.168\\.0\\.10, 192\\.168\\.0\\.11"); filterDef.addInitParameter("trustedProxies", "proxy1, proxy2, proxy3"); - filterDef.addInitParameter("remoteIPHeader", "x-forwarded-for"); + filterDef.addInitParameter("remoteIpHeader", "x-forwarded-for"); filterDef.addInitParameter("proxiesHeader", "x-forwarded-by"); MockHttpServletRequest request = new MockHttpServletRequest(); @@ -244,7 +244,7 @@ public class TestRemoteIpFilter extends TomcatBaseTest { FilterDef filterDef = new FilterDef(); filterDef.addInitParameter("internalProxies", "192\\.168\\.0\\.10, 192\\.168\\.0\\.11"); filterDef.addInitParameter("trustedProxies", "proxy1, proxy2, proxy3"); - filterDef.addInitParameter("remoteIPHeader", "x-forwarded-for"); + filterDef.addInitParameter("remoteIpHeader", "x-forwarded-for"); filterDef.addInitParameter("proxiesHeader", "x-forwarded-by"); MockHttpServletRequest request = new MockHttpServletRequest(); @@ -276,7 +276,7 @@ public class TestRemoteIpFilter extends TomcatBaseTest { FilterDef filterDef = new FilterDef(); filterDef.addInitParameter("internalProxies", "192\\.168\\.0\\.10, 192\\.168\\.0\\.11"); filterDef.addInitParameter("trustedProxies", "proxy1, proxy2, proxy3"); - filterDef.addInitParameter("remoteIPHeader", "x-forwarded-for"); + filterDef.addInitParameter("remoteIpHeader", "x-forwarded-for"); filterDef.addInitParameter("proxiesHeader", "x-forwarded-by"); filterDef.setFilter(remoteIpFilter); @@ -309,7 +309,7 @@ public class TestRemoteIpFilter extends TomcatBaseTest { FilterDef filterDef = new FilterDef(); filterDef.addInitParameter("internalProxies", "127\\.0\\.0\\.1, 192\\.168\\..*, another-internal-proxy"); filterDef.addInitParameter("trustedProxies", "proxy1, proxy2, proxy3"); - filterDef.addInitParameter("remoteIPHeader", "x-forwarded-for"); + filterDef.addInitParameter("remoteIpHeader", "x-forwarded-for"); filterDef.addInitParameter("proxiesHeader", "x-forwarded-by"); MockHttpServletRequest request = new MockHttpServletRequest(); @@ -340,7 +340,7 @@ public class TestRemoteIpFilter extends TomcatBaseTest { FilterDef filterDef = new FilterDef(); filterDef.addInitParameter("internalProxies", "192\\.168\\.0\\.10, 192\\.168\\.0\\.11"); filterDef.addInitParameter("trustedProxies", "proxy1, proxy2, proxy3"); - filterDef.addInitParameter("remoteIPHeader", "x-forwarded-for"); + filterDef.addInitParameter("remoteIpHeader", "x-forwarded-for"); filterDef.addInitParameter("proxiesHeader", "x-forwarded-by"); MockHttpServletRequest request = new MockHttpServletRequest(); @@ -371,7 +371,7 @@ public class TestRemoteIpFilter extends TomcatBaseTest { FilterDef filterDef = new FilterDef(); filterDef.addInitParameter("internalProxies", "192\\.168\\.0\\.10, 192\\.168\\.0\\.11"); filterDef.addInitParameter("trustedProxies", "proxy1, proxy2, proxy3"); - filterDef.addInitParameter("remoteIPHeader", "x-forwarded-for"); + filterDef.addInitParameter("remoteIpHeader", "x-forwarded-for"); filterDef.addInitParameter("proxiesHeader", "x-forwarded-by"); MockHttpServletRequest request = new MockHttpServletRequest(); @@ -402,7 +402,7 @@ public class TestRemoteIpFilter extends TomcatBaseTest { FilterDef filterDef = new FilterDef(); filterDef.addInitParameter("internalProxies", "192\\.168\\.0\\.10, 192\\.168\\.0\\.11"); filterDef.addInitParameter("trustedProxies", "proxy1, proxy2, proxy3"); - filterDef.addInitParameter("remoteIPHeader", "x-forwarded-for"); + filterDef.addInitParameter("remoteIpHeader", "x-forwarded-for"); filterDef.addInitParameter("proxiesHeader", "x-forwarded-by"); MockHttpServletRequest request = new MockHttpServletRequest(); -- 2.11.0