This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 8550ae9 Use standard Java name for UTF-8
8550ae9 is described below
commit 8550ae9ae6de62d570c781f3bc9cd6095c55f4bd
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jun 24 20:09:20 2019 +0100
Use standard Java name for UTF-8
---
java/org/apache/catalina/servlets/DefaultServlet.java | 4 ++--
java/org/apache/catalina/servlets/WebdavServlet.java | 2 +-
java/org/apache/catalina/users/MemoryUserDatabase.java | 2 +-
java/org/apache/jasper/EmbeddedServletOptions.java | 2 +-
java/org/apache/tomcat/util/buf/UEncoder.java | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 2ae7460..2deb1dd 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -1432,7 +1432,7 @@ public class DefaultServlet extends HttpServlet {
Transformer transformer = tFactory.newTransformer(xsltSource);
ByteArrayOutputStream stream = new ByteArrayOutputStream();
- OutputStreamWriter osWriter = new OutputStreamWriter(stream,
"UTF8");
+ OutputStreamWriter osWriter = new OutputStreamWriter(stream,
"UTF-8");
StreamResult out = new StreamResult(osWriter);
transformer.transform(xmlSource, out);
osWriter.flush();
@@ -1463,7 +1463,7 @@ public class DefaultServlet extends HttpServlet {
// Prepare a writer to a buffered area
ByteArrayOutputStream stream = new ByteArrayOutputStream();
- OutputStreamWriter osWriter = new OutputStreamWriter(stream, "UTF8");
+ OutputStreamWriter osWriter = new OutputStreamWriter(stream, "UTF-8");
PrintWriter writer = new PrintWriter(osWriter);
StringBuilder sb = new StringBuilder();
diff --git a/java/org/apache/catalina/servlets/WebdavServlet.java
b/java/org/apache/catalina/servlets/WebdavServlet.java
index 0a5df26..ffda8f7 100644
--- a/java/org/apache/catalina/servlets/WebdavServlet.java
+++ b/java/org/apache/catalina/servlets/WebdavServlet.java
@@ -1618,7 +1618,7 @@ public class WebdavServlet extends DefaultServlet {
// Remove url encoding from destination
destinationPath = org.apache.catalina.util.RequestUtil.URLDecode(
- destinationPath, "UTF8");
+ destinationPath, "UTF-8");
int protocolIndex = destinationPath.indexOf("://");
if (protocolIndex >= 0) {
diff --git a/java/org/apache/catalina/users/MemoryUserDatabase.java
b/java/org/apache/catalina/users/MemoryUserDatabase.java
index 097954f..8e5ae25 100644
--- a/java/org/apache/catalina/users/MemoryUserDatabase.java
+++ b/java/org/apache/catalina/users/MemoryUserDatabase.java
@@ -547,7 +547,7 @@ public class MemoryUserDatabase implements UserDatabase {
// Configure our PrintWriter
FileOutputStream fos = new FileOutputStream(fileNew);
- OutputStreamWriter osw = new OutputStreamWriter(fos, "UTF8");
+ OutputStreamWriter osw = new OutputStreamWriter(fos, "UTF-8");
writer = new PrintWriter(osw);
// Print the file prolog
diff --git a/java/org/apache/jasper/EmbeddedServletOptions.java
b/java/org/apache/jasper/EmbeddedServletOptions.java
index 917afb3..49e798c 100644
--- a/java/org/apache/jasper/EmbeddedServletOptions.java
+++ b/java/org/apache/jasper/EmbeddedServletOptions.java
@@ -163,7 +163,7 @@ public final class EmbeddedServletOptions implements
Options {
* Java platform encoding to generate the JSP
* page servlet.
*/
- private String javaEncoding = "UTF8";
+ private String javaEncoding = "UTF-8";
/**
* Modification test interval.
diff --git a/java/org/apache/tomcat/util/buf/UEncoder.java
b/java/org/apache/tomcat/util/buf/UEncoder.java
index bad7e9e..307d50f 100644
--- a/java/org/apache/tomcat/util/buf/UEncoder.java
+++ b/java/org/apache/tomcat/util/buf/UEncoder.java
@@ -56,7 +56,7 @@ public final class UEncoder {
private CharChunk output=null;
private final boolean readOnlySafeChars;
- private String encoding="UTF8";
+ private String encoding="UTF-8";
public UEncoder() {
this.safeChars = initialSafeChars();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
