[tomcat] branch master updated: Make UTF-8 the default request and response encoding

[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


The following commit(s) were added to refs/heads/master by this push:
     new c69d80a  Make UTF-8 the default request and response encoding
c69d80a is described below

commit c69d80a58e8bc8fc9eb43eed269b01112669c906
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jan 31 19:58:01 2020 +0000

    Make UTF-8 the default request and response encoding
---
 TOMCAT-NEXT.txt            | 36 ++++++++++++++----------------------
 conf/web.xml               |  5 +++++
 webapps/docs/changelog.xml |  6 ++++++
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/TOMCAT-NEXT.txt b/TOMCAT-NEXT.txt
index 2ab0dad..332bc9b 100644
--- a/TOMCAT-NEXT.txt
+++ b/TOMCAT-NEXT.txt
@@ -27,37 +27,29 @@ Items carried over from the 9.0.x list:
 
 New items for 10.0.0.x onwards:
 
- 1.  Remove APR connector.
+ 1. Remove APR connector.
 
- 2.  Remove org.apache.tomcat.jni and replace with the minimum necessary to
-     interface with OpenSSL and clones.
-     We might want to park this one until we see what is available direct from
-     the JRE with project Panama.
+ 2. Remove org.apache.tomcat.jni and replace with the minimum necessary to
+    interface with OpenSSL and clones.
+    We might want to park this one until we see what is available direct from
+    the JRE with project Panama.
 
- 3.  Clean-up content-type header processing. Remove the optional space after
-     the ';' character (if any). Don't mutate the header if there is no charset
-     parameter. See BZ 62912 for some discussion and additional references.
+ 3. Clean-up content-type header processing. Remove the optional space after
+    the ';' character (if any). Don't mutate the header if there is no charset
+    parameter. See BZ 62912 for some discussion and additional references.
 
- 4. Consider including
-    <request-character-encoding>UTF-8</request-character-encoding>
-    in conf/web.xml
-
- 5. Consider including
-    <response-character-encoding>UTF-8</response-character-encoding>
-    in conf/web.xml
-
- 6. RFC 3986 states (section 2.2) that a %nn encoded delimiter is NOT equivalent
+ 4. RFC 3986 states (section 2.2) that a %nn encoded delimiter is NOT equivalent
     to the decoded form. Provide an option not to decode delimiters in %nn form.
 
- 7. BZ 56966. Refactor internal request timing to use System.nanoTime()
+ 5. BZ 56966. Refactor internal request timing to use System.nanoTime()
 
- 8. BZ 63286. Make behaviour of %D and %T consistent with httpd.
+ 6. BZ 63286. Make behaviour of %D and %T consistent with httpd.
 
- 9. Refactor DefaultServlet to use Ranges in parseRanges().
+ 7. Refactor DefaultServlet to use Ranges in parseRanges().
 
-10. Consider disabling the AJP connector by default.
+ 8. Consider disabling the AJP connector by default.
 
-11. Share configuration between HTTP/1.1 and nested HTTP/2 rather than duplicating.
+ 9. Share configuration between HTTP/1.1 and nested HTTP/2 rather than duplicating.
 
 
 Deferred until 10.0.x:
diff --git a/conf/web.xml b/conf/web.xml
index 9c0a248..cce6b8f 100644
--- a/conf/web.xml
+++ b/conf/web.xml
@@ -32,6 +32,11 @@
   <!-- They should go in the "/WEB-INF/web.xml" file in your application.   -->
 
 
+  <!-- Set the default request and response character encodings to UTF-8.   -->
+  <request-character-encoding>UTF-8</request-character-encoding>
+  <response-character-encoding>UTF-8</response-character-encoding>
+
+
   <!-- ================== Built In Servlet Definitions ==================== -->
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4389a7d..b9fb1c3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -69,6 +69,12 @@
       <update>
         Add connection pooling to JNDI realm. (remm)
       </update>
+      <update>
+        Use <code>&lt;request-character-encoding&gt;</code> and
+        <code>&lt;response-character-encoding&gt;</code> in
+        <code>conf/web.xml</code> to set the default request and response
+        character encodings to UTF-8. (markt)
+      </update>
     </changelog>
   </subsection>
   <subsection name="Coyote">


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org