remm 2003/11/11 12:56:56
Modified: coyote/src/java/org/apache/coyote Response.java
Log:
- Don't add the charset if it's the default one.
- BTW, the patch which caused that is bad ! getContentType gets always
called, and it generates a lot of GC ! This needs to be optimized further.
Revision Changes Path
1.30 +5 -3
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Response.java
Index: Response.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/Response.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Response.java 14 Oct 2003 19:21:25 -0000 1.29
+++ Response.java 11 Nov 2003 20:56:56 -0000 1.30
@@ -552,9 +552,11 @@
String ret = contentType;
- if (ret != null && characterEncoding != null) {
- ret += ";charset=";
- ret += characterEncoding;
+ if (ret != null
+ && characterEncoding != null
+ && !(Constants.DEFAULT_CHARACTER_ENCODING.equals
+ (characterEncoding))) {
+ ret = ret + ";charset=" + characterEncoding;
}
return ret;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
