[tomcat] 03/03: Use standard form to reference UTF-8

[markt]

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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org