You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by sc...@apache.org on 2020/01/07 14:16:56 UTC
[tomcat] branch master updated: Remove dependency on
org.apache.coyote package.
This is an automated email from the ASF dual-hosted git repository.
schultz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 050d15c Remove dependency on org.apache.coyote package.
050d15c is described below
commit 050d15c5426ba9924bf6dedaa4974b3a1a7fb038
Author: Christopher Schultz <ch...@christopherschultz.net>
AuthorDate: Tue Jan 7 09:16:12 2020 -0500
Remove dependency on org.apache.coyote package.
---
java/org/apache/catalina/ssi/SSIServletExternalResolver.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/ssi/SSIServletExternalResolver.java b/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
index 6286ed8..fdd995a 100644
--- a/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
+++ b/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
@@ -22,6 +22,7 @@ import java.io.UnsupportedEncodingException;
import java.net.URL;
import java.net.URLConnection;
import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.Date;
import java.util.Enumeration;
@@ -35,7 +36,6 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.connector.Request;
-import org.apache.coyote.Constants;
import org.apache.tomcat.util.buf.B2CConverter;
import org.apache.tomcat.util.buf.UDecoder;
import org.apache.tomcat.util.http.RequestUtil;
@@ -273,7 +273,7 @@ public class SSIServletExternalResolver implements SSIExternalResolver {
queryStringCharset = uriCharset;
} else {
// Use default as a last resort
- queryStringCharset = Constants.DEFAULT_URI_CHARSET;
+ queryStringCharset = StandardCharsets.UTF_8;
}
retVal = UDecoder.URLDecode(queryString, queryStringCharset);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org