Author: markt
Date: Thu Nov 12 14:33:46 2015
New Revision: 1714054
URL: http://svn.apache.org/viewvc?rev=1714054&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58603
Need to override getRequestURl so the values set by the filter are used.
Modified:
tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
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=1714054&r1=1714053&r2=1714054&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Thu Nov
12 14:33:46 2015
@@ -625,6 +625,27 @@ public class RemoteIpFilter extends Gene
}
@Override
+ public StringBuffer getRequestURL() {
+ StringBuffer url = new StringBuffer();
+ String scheme = getScheme();
+ int port = getServerPort();
+ if (port < 0) {
+ port = 80; // Work around java.net.URL bug
+ }
+ url.append(scheme);
+ url.append("://");
+ url.append(getServerName());
+ if ((scheme.equals("http") && (port != 80))
+ || (scheme.equals("https") && (port != 443))) {
+ url.append(':');
+ url.append(port);
+ }
+ url.append(getRequestURI());
+
+ return url;
+ }
+
+ @Override
public PushBuilder getPushBuilder() {
return new ApplicationPushBuilder(this);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
