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 2017/06/19 19:19:25 UTC
svn commit: r1799264 -
/tomcat/tc8.5.x/trunk/java/org/apache/coyote/Response.java
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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1799264 -
/tomcat/tc8.5.x/trunk/java/org/apache/coyote/Response.java
Posted by Mark Thomas <ma...@apache.org>.
On 19/06/17 20:19, markt@apache.org wrote:
> 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
I think some refactoring is called for to revert some of the
deprecation. It is on my TODO list.
Mark
>
> 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-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org