On 20 Feb 2002 [EMAIL PROTECTED] wrote:
> Date: 20 Feb 2002 08:29:00 -0000
> From: [EMAIL PROTECTED]
> Reply-To: Tomcat Developers List <[EMAIL PROTECTED]>
> To: [EMAIL PROTECTED]
> Subject: cvs commit:
> jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector
> ResponseBase.java
>
> remm 02/02/20 00:29:00
>
> Modified: catalina/src/share/org/apache/catalina/connector
> ResponseBase.java
> Log:
> - Fix for bug 6569. Set the charset of content-type in setLocale.
>
What happens if contentType is null because the application hasn't set it
yet?
Craig
> Revision Changes Path
> 1.21 +7 -4
>jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseBase.java
>
> Index: ResponseBase.java
> ===================================================================
> RCS file:
>/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseBase.java,v
> retrieving revision 1.20
> retrieving revision 1.21
> diff -u -r1.20 -r1.21
> --- ResponseBase.java 14 Feb 2002 17:03:39 -0000 1.20
> +++ ResponseBase.java 20 Feb 2002 08:29:00 -0000 1.21
> @@ -1,7 +1,7 @@
> /*
> - * $Header:
>/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseBase.java,v
> 1.20 2002/02/14 17:03:39 remm Exp $
> - * $Revision: 1.20 $
> - * $Date: 2002/02/14 17:03:39 $
> + * $Header:
>/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseBase.java,v
> 1.21 2002/02/20 08:29:00 remm Exp $
> + * $Revision: 1.21 $
> + * $Date: 2002/02/20 08:29:00 $
> *
> * ====================================================================
> *
> @@ -89,7 +89,7 @@
> *
> * @author Craig R. McClanahan
> * @author Remy Maucherat
> - * @version $Revision: 1.20 $ $Date: 2002/02/14 17:03:39 $
> + * @version $Revision: 1.21 $ $Date: 2002/02/20 08:29:00 $
> */
>
> public abstract class ResponseBase
> @@ -891,6 +891,9 @@
> if ((this.encoding == null) && (this.context != null)) {
> CharsetMapper mapper = context.getCharsetMapper();
> this.encoding = mapper.getCharset(locale);
> + if (contentType.indexOf(';') < 0) {
> + contentType = contentType + ";charset=" + encoding;
> + }
> }
>
> }
>
>
>
>
> --
> To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
>
>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
