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 18:07:49 UTC
[tomcat] branch 8.5.x updated (f2dfcb0 -> 30e983d)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from f2dfcb0 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58590
new ecf9143 Use standard charset rather than (non-standard) name for UTF-8
new 30e983d Use standard form to reference UTF-8
The 2 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/jasper/EmbeddedServletOptions.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: 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 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 30e983d787eced738330a0063dee6beb6b1ef5b2
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 1bf1546..5a535e1 100644
--- a/java/org/apache/catalina/storeconfig/StoreLoader.java
+++ b/java/org/apache/catalina/storeconfig/StoreLoader.java
@@ -32,7 +32,7 @@ import org.xml.sax.SAXException;
*
* <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 4a41af2..4ddce3c 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
[tomcat] 01/02: 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 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit ecf9143103b184bd996d519c4d8e454257b1cd30
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 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java b/java/org/apache/catalina/servlets/DefaultServlet.java
index c99afe1..d7fde267 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -1805,7 +1805,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();
@@ -1880,7 +1880,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();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org