remm 01/01/31 15:05:11
Modified: catalina/src/share/org/apache/catalina/servlets
DefaultServlet.java
Log:
- Change the Unicode encoding name to UTF8, as the UTF-8 name is not present
in all Java2 versions (the earlier ones didn't have it).
Thanks to Tim Tye (<[EMAIL PROTECTED]>) for the info.
Revision Changes Path
1.24 +6 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Index: DefaultServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- DefaultServlet.java 2001/01/30 19:41:50 1.23
+++ DefaultServlet.java 2001/01/31 23:05:08 1.24
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
1.23 2001/01/30 19:41:50 remm Exp $
- * $Revision: 1.23 $
- * $Date: 2001/01/30 19:41:50 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
1.24 2001/01/31 23:05:08 remm Exp $
+ * $Revision: 1.24 $
+ * $Date: 2001/01/31 23:05:08 $
*
* ====================================================================
*
@@ -122,7 +122,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.23 $ $Date: 2001/01/30 19:41:50 $
+ * @version $Revision: 1.24 $ $Date: 2001/01/31 23:05:08 $
*/
public class DefaultServlet
@@ -865,7 +865,7 @@
// bad stuff(tm) can be caught by the later checks
String normalized = path;
if (normalized.indexOf('%') >= 0)
- normalized = RequestUtil.URLDecode(normalized, "UTF-8");
+ normalized = RequestUtil.URLDecode(normalized, "UTF8");
if (normalized == null)
return (null);
@@ -931,7 +931,7 @@
ByteArrayOutputStream buf = new ByteArrayOutputStream(maxBytesPerChar);
OutputStreamWriter writer = null;
try {
- writer = new OutputStreamWriter(buf, "UTF-8");
+ writer = new OutputStreamWriter(buf, "UTF8");
} catch (Exception e) {
e.printStackTrace();
writer = new OutputStreamWriter(buf);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
