jfclere 2005/05/04 00:04:30
Modified: catalina/src/share/org/apache/catalina/servlets
DefaultServlet.java
Log:
When the file comes from a resource fileEncoding was not working.
The default beahviour is unchanged: the file is send without a conversion.
Revision Changes Path
1.37 +11 -1 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Index: DefaultServlet.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- DefaultServlet.java 2 May 2005 16:52:10 -0000 1.36
+++ DefaultServlet.java 4 May 2005 07:04:30 -0000 1.37
@@ -1725,6 +1725,16 @@
if (cacheEntry.resource != null) {
byte buffer[] = cacheEntry.resource.getContent();
if (buffer != null) {
+ if (fileEncoding != null &&
+ cacheEntry.attributes.getMimeType()!=null &&
+ cacheEntry.attributes.getMimeType().equals("text/html")) {
+ /* the "binary" have to be converted from fileEncoding to UTF-8 */
+ try {
+ String str = new String(buffer, fileEncoding);
+ buffer = str.getBytes("UTF-8");
+ } catch (Exception e) {
+ }
+ }
ostream.write(buffer, 0, buffer.length);
return;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org
|