Author: markt
Date: Wed Jan 6 13:37:16 2016
New Revision: 1723317
URL: http://svn.apache.org/viewvc?rev=1723317&view=rev
Log:
Switch to use the new UriUtil class.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1723317&r1=1723316&r2=1723317&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Wed Jan 6
13:37:16 2016
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.net.MalformedURLException;
import java.net.URI;
+import java.net.URL;
import java.nio.charset.Charset;
import java.security.AccessController;
import java.security.PrivilegedAction;
@@ -48,6 +49,7 @@ import org.apache.catalina.Wrapper;
import org.apache.catalina.security.SecurityUtil;
import org.apache.catalina.util.RequestUtil;
import org.apache.catalina.util.SessionConfig;
+import org.apache.catalina.util.UriUtil;
import org.apache.coyote.ActionCode;
import org.apache.tomcat.util.buf.CharChunk;
import org.apache.tomcat.util.buf.UEncoder;
@@ -55,7 +57,6 @@ import org.apache.tomcat.util.buf.UEncod
import org.apache.tomcat.util.http.FastHttpDateFormat;
import org.apache.tomcat.util.http.MimeHeaders;
import org.apache.tomcat.util.http.parser.MediaTypeCache;
-import org.apache.tomcat.util.net.URL;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -1593,7 +1594,7 @@ public class Response
throw iae;
}
- } else if (leadingSlash || !URL.hasScheme(location)) {
+ } else if (leadingSlash || !UriUtil.hasScheme(location)) {
redirectURLCC.recycle();
Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java?rev=1723317&r1=1723316&r2=1723317&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java Wed
Jan 6 13:37:16 2016
@@ -45,11 +45,11 @@ import org.apache.catalina.connector.Con
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.util.URLEncoder;
+import org.apache.catalina.util.UriUtil;
import org.apache.catalina.valves.ValveBase;
import org.apache.tomcat.util.buf.CharChunk;
import org.apache.tomcat.util.buf.MessageBytes;
import org.apache.tomcat.util.http.RequestUtil;
-import org.apache.tomcat.util.net.URL;
public class RewriteValve extends ValveBase {
@@ -342,7 +342,7 @@ public class RewriteValve extends ValveB
// 1. this valve is associated with a context
// 2. the url starts with a leading slash
// 3. the url isn't absolute
- if (context && urlString.charAt(0) == '/' &&
!URL.hasScheme(urlString)) {
+ if (context && urlString.charAt(0) == '/' &&
!UriUtil.hasScheme(urlString)) {
urlString.insert(0,
request.getContext().getEncodedPath());
}
response.sendRedirect(urlString.toString());
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
