remm 02/02/20 00:29:09
Modified: catalina/src/share/org/apache/catalina/connector Tag:
tomcat_40_branch ResponseBase.java
Log:
- Fix for bug 6569. Set the charset of content-type in setLocale.
Revision Changes Path
No revision
No revision
1.16.2.3 +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.16.2.2
retrieving revision 1.16.2.3
diff -u -r1.16.2.2 -r1.16.2.3
--- ResponseBase.java 14 Feb 2002 17:03:26 -0000 1.16.2.2
+++ ResponseBase.java 20 Feb 2002 08:29:09 -0000 1.16.2.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseBase.java,v
1.16.2.2 2002/02/14 17:03:26 remm Exp $
- * $Revision: 1.16.2.2 $
- * $Date: 2002/02/14 17:03:26 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/ResponseBase.java,v
1.16.2.3 2002/02/20 08:29:09 remm Exp $
+ * $Revision: 1.16.2.3 $
+ * $Date: 2002/02/20 08:29:09 $
*
* ====================================================================
*
@@ -89,7 +89,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.16.2.2 $ $Date: 2002/02/14 17:03:26 $
+ * @version $Revision: 1.16.2.3 $ $Date: 2002/02/20 08:29:09 $
*/
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]>
