svn commit: r1799264 - /tomcat/tc8.5.x/trunk/java/org/apache/coyote/Response.java

[markt]

Author: markt
Date: Mon Jun 19 19:19:25 2017
New Revision: 1799264

URL: http://svn.apache.org/viewvc?rev=1799264&view=rev
Log:
Fix back-port

Modified:
    tomcat/tc8.5.x/trunk/java/org/apache/coyote/Response.java

Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/Response.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/Response.java?rev=1799264&r1=1799263&r2=1799264&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/Response.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/Response.java Mon Jun 19 
19:19:25 2017
@@ -411,7 +411,7 @@ public final class Response {
         }
 
         try {
-            setCharset(B2CConverter.getCharset(charset));
+            setCharset(charset);
         } catch (UnsupportedEncodingException e) {
             log.warn(sm.getString("response.encoding.invalid", charset), e);
         }



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