Index: java/org/apache/catalina/filters/RemoteIpFilter.java
===================================================================
--- java/org/apache/catalina/filters/RemoteIpFilter.java (revision 833729)
+++ java/org/apache/catalina/filters/RemoteIpFilter.java (working copy)
@@ -156,8 +156,8 @@
*
*
* <filter>
- * <filter-name>XForwardedFilter</filter-name>
- * <filter-class>fr.xebia.servlet.filter.XForwardedFilter</filter-class>
+ * <filter-name>RemoteIpFilter</filter-name>
+ * <filter-class>org.apache.catalina.filters.RemoteIpFilter</filter-class>
* <init-param>
* <param-name>internalProxies</param-name><param-value>192\.168\.0\.10, 192\.168\.0\.11</param-value>
* </init-param>
@@ -173,7 +173,7 @@
* </filter>
*
* <filter-mapping>
- * <filter-name>XForwardedFilter</filter-name>
+ * <filter-name>RemoteIpFilter</filter-name>
* <url-pattern>/*</url-pattern>
* <dispatcher>REQUEST</dispatcher>
* </filter-mapping>
*
* | property |
- * Value Before XForwardedFilter |
- * Value After XForwardedFilter |
+ * Value Before RemoteIpFilter |
+ * Value After RemoteIpFilter |
*
*
* | request.remoteAddr |
@@ -229,12 +229,12 @@
* Sample with trusted proxies
*
*
- * XForwardedFilter configuration:
+ * RemoteIpFilter configuration:
*
*
* <filter>
- * <filter-name>XForwardedFilter</filter-name>
- * <filter-class>fr.xebia.servlet.filter.XForwardedFilter</filter-class>
+ * <filter-name>RemoteIpFilter</filter-name>
+ * <filter-class>org.apache.catalina.filters.RemoteIpFilter</filter-class>
* <init-param>
* <param-name>internalProxies</param-name><param-value>192\.168\.0\.10, 192\.168\.0\.11</param-value>
* </init-param>
@@ -250,7 +250,7 @@
* </filter>
*
* <filter-mapping>
- * <filter-name>XForwardedFilter</filter-name>
+ * <filter-name>RemoteIpFilter</filter-name>
* <url-pattern>/*</url-pattern>
* <dispatcher>REQUEST</dispatcher>
* </filter-mapping>
*
* | property |
- * Value Before XForwardedFilter |
- * Value After XForwardedFilter |
+ * Value Before RemoteIpFilter |
+ * Value After RemoteIpFilter |
*
*
* | request.remoteAddr |
@@ -286,12 +286,12 @@
* Sample with internal and trusted proxies
*
*
- * XForwardedFilter configuration:
+ * RemoteIpFilter configuration:
*
*
* <filter>
- * <filter-name>XForwardedFilter</filter-name>
- * <filter-class>fr.xebia.servlet.filter.XForwardedFilter</filter-class>
+ * <filter-name>RemoteIpFilter</filter-name>
+ * <filter-class>org.apache.catalina.filters.RemoteIpFilter</filter-class>
* <init-param>
* <param-name>internalProxies</param-name><param-value>192\.168\.0\.10, 192\.168\.0\.11</param-value>
* </init-param>
@@ -307,7 +307,7 @@
* </filter>
*
* <filter-mapping>
- * <filter-name>XForwardedFilter</filter-name>
+ * <filter-name>RemoteIpFilter</filter-name>
* <url-pattern>/*</url-pattern>
* <dispatcher>REQUEST</dispatcher>
* </filter-mapping>
*
* | property |
- * Value Before XForwardedFilter |
- * Value After XForwardedFilter |
+ * Value Before RemoteIpFilter |
+ * Value After RemoteIpFilter |
*
*
* | request.remoteAddr |
@@ -344,12 +344,12 @@
* Sample with an untrusted proxy
*
*
- * XForwardedFilter configuration:
+ * RemoteIpFilter configuration:
*
*
* <filter>
- * <filter-name>XForwardedFilter</filter-name>
- * <filter-class>fr.xebia.servlet.filter.XForwardedFilter</filter-class>
+ * <filter-name>RemoteIpFilter</filter-name>
+ * <filter-class>org.apache.catalina.filters.RemoteIpFilter</filter-class>
* <init-param>
* <param-name>internalProxies</param-name><param-value>192\.168\.0\.10, 192\.168\.0\.11</param-value>
* </init-param>
@@ -365,7 +365,7 @@
* </filter>
*
* <filter-mapping>
- * <filter-name>XForwardedFilter</filter-name>
+ * <filter-name>RemoteIpFilter</filter-name>
* <url-pattern>/*</url-pattern>
* <dispatcher>REQUEST</dispatcher>
* </filter-mapping>
*
* | property |
- * Value Before XForwardedFilter |
- * Value After XForwardedFilter |
+ * Value Before RemoteIpFilter |
+ * Value After RemoteIpFilter |
*
*
* | request.remoteAddr |
@@ -580,7 +580,7 @@
protected static final String HTTPS_SERVER_PORT_PARAMETER = "httpsServerPort";
- protected static final String INTERNAL_PROXIES_PARAMETER = "allowedInternalProxies";
+ protected static final String INTERNAL_PROXIES_PARAMETER = "internalProxies";
/**
* Logger
@@ -756,13 +756,13 @@
if (log.isDebugEnabled()) {
log.debug("Incoming request " + request.getRequestURI() + " with originalRemoteAddr '" + request.getRemoteAddr()
- + "', originalRemoteHost='" + request.getRemoteHost() + "', originalSecure='" + request.isSecure()
- + "', originalScheme='" + request.getScheme() + "', original[" + remoteIPHeader + "]='"
- + request.getHeader(remoteIPHeader) + ", original[" + protocolHeader + "]='"
- + request.getHeader(protocolHeader) + "' will be seen as newRemoteAddr='" + xRequest.getRemoteAddr()
- + "', newRemoteHost='" + xRequest.getRemoteHost() + "', newScheme='" + xRequest.getScheme() + "', newSecure='"
- + xRequest.isSecure() + "', new[" + remoteIPHeader + "]='" + xRequest.getHeader(remoteIPHeader) + ", new["
- + proxiesHeader + "]='" + xRequest.getHeader(proxiesHeader) + "'");
+ + "', originalRemoteHost='" + request.getRemoteHost() + "', originalSecure='" + request.isSecure()
+ + "', originalScheme='" + request.getScheme() + "', original[" + remoteIPHeader + "]='"
+ + request.getHeader(remoteIPHeader) + ", original[" + protocolHeader + "]='"
+ + (protocolHeader == null ? null : request.getHeader(protocolHeader)) + "' will be seen as newRemoteAddr='"
+ + xRequest.getRemoteAddr() + "', newRemoteHost='" + xRequest.getRemoteHost() + "', newScheme='"
+ + xRequest.getScheme() + "', newSecure='" + xRequest.isSecure() + "', new[" + remoteIPHeader + "]='"
+ + xRequest.getHeader(remoteIPHeader) + ", new[" + proxiesHeader + "]='" + xRequest.getHeader(proxiesHeader) + "'");
}
chain.doFilter(xRequest, response);
} else {