You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/06/24 09:12:08 UTC
[tomcat] branch master updated (d328560 -> 7b37b04)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from d328560 Fix charset name for UTF-32LE in bom detection.
new a610cf4 Remove mappings provided by the JVM
new d0bfb8a Use standard charset rather than (non-standard) name for UTF-8
new 7b37b04 Use standard form to reference UTF-8
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/catalina/servlets/DefaultServlet.java | 4 ++--
java/org/apache/catalina/storeconfig/StoreLoader.java | 2 +-
java/org/apache/catalina/users/MemoryUserDatabase.java | 3 ++-
java/org/apache/jasper/EmbeddedServletOptions.java | 2 +-
.../apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java | 7 -------
5 files changed, 6 insertions(+), 12 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/03: Use standard charset rather than (non-standard)
name for UTF-8
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit d0bfb8a33d15de94c9f3f31a6c4a0594b0c831fb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jun 24 10:11:08 2019 +0100
Use standard charset rather than (non-standard) name for UTF-8
---
java/org/apache/catalina/servlets/DefaultServlet.java | 4 ++--
java/org/apache/catalina/users/MemoryUserDatabase.java | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java b/java/org/apache/catalina/servlets/DefaultServlet.java
index a9ba7b6..16eb297 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -1756,7 +1756,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, StandardCharsets.UTF_8);
StreamResult out = new StreamResult(osWriter);
transformer.transform(xmlSource, out);
osWriter.flush();
@@ -1811,7 +1811,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, StandardCharsets.UTF_8);
PrintWriter writer = new PrintWriter(osWriter);
StringBuilder sb = new StringBuilder();
diff --git a/java/org/apache/catalina/users/MemoryUserDatabase.java b/java/org/apache/catalina/users/MemoryUserDatabase.java
index 2a594f9..28856b4 100644
--- a/java/org/apache/catalina/users/MemoryUserDatabase.java
+++ b/java/org/apache/catalina/users/MemoryUserDatabase.java
@@ -24,6 +24,7 @@ import java.io.PrintWriter;
import java.net.URI;
import java.net.URL;
import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Map;
@@ -566,7 +567,7 @@ public class MemoryUserDatabase implements UserDatabase {
writeLock.lock();
try {
try (FileOutputStream fos = new FileOutputStream(fileNew);
- OutputStreamWriter osw = new OutputStreamWriter(fos, "UTF8");
+ OutputStreamWriter osw = new OutputStreamWriter(fos, StandardCharsets.UTF_8);
PrintWriter writer = new PrintWriter(osw)) {
// Print the file prolog
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/03: Remove mappings provided by the JVM
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a610cf45177b7d49a23c99bb969c391f0d74a1b3
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jun 24 10:09:55 2019 +0100
Remove mappings provided by the JVM
---
.../apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java | 7 -------
1 file changed, 7 deletions(-)
diff --git a/java/org/apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java b/java/org/apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java
index b5b4cdd..a6200ca 100644
--- a/java/org/apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java
+++ b/java/org/apache/tomcat/util/http/fileupload/util/mime/MimeUtility.java
@@ -68,15 +68,8 @@ public final class MimeUtility {
private static final Map<String, String> MIME2JAVA = new HashMap<>();
static {
- MIME2JAVA.put("iso-2022-cn", "ISO2022CN");
- MIME2JAVA.put("iso-2022-kr", "ISO2022KR");
- MIME2JAVA.put("utf-8", "UTF8");
- MIME2JAVA.put("utf8", "UTF8");
MIME2JAVA.put("ja_jp.iso2022-7", "ISO2022JP");
MIME2JAVA.put("ja_jp.eucjp", "EUCJIS");
- MIME2JAVA.put("euc-kr", "KSC5601");
- MIME2JAVA.put("euckr", "KSC5601");
- MIME2JAVA.put("us-ascii", "ISO-8859-1");
MIME2JAVA.put("x-us-ascii", "ISO-8859-1");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/03: Use standard form to reference UTF-8
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 7b37b0429dc511929a546078f5ce9e5517a7eab4
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jun 24 10:11:29 2019 +0100
Use standard form to reference UTF-8
---
java/org/apache/catalina/storeconfig/StoreLoader.java | 2 +-
java/org/apache/jasper/EmbeddedServletOptions.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/storeconfig/StoreLoader.java b/java/org/apache/catalina/storeconfig/StoreLoader.java
index 17fba3a..bbbfdfc 100644
--- a/java/org/apache/catalina/storeconfig/StoreLoader.java
+++ b/java/org/apache/catalina/storeconfig/StoreLoader.java
@@ -29,7 +29,7 @@ import org.apache.tomcat.util.file.ConfigurationSource.Resource;
*
* <pre>
* {@code
- * <Registry name="" encoding="UTF8" >
+ * <Registry name="" encoding="UTF-8" >
* <Description
* tag="Server"
* standard="true"
diff --git a/java/org/apache/jasper/EmbeddedServletOptions.java b/java/org/apache/jasper/EmbeddedServletOptions.java
index d9aded1..3129cdb 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.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org