marcsaeg 01/03/09 15:35:26
Modified: src/share/org/apache/jasper/compiler Tag: tomcat_32
Compiler.java JspParseEventListener.java
JspReader.java
Log:
Change JSP default character encoding from 8859_1 to ISO-8859-1 which is
the preferred name (not to mention the one in the specification).
PR: 285
Submitted by: [EMAIL PROTECTED] (Palle Girgensohn)
Revision Changes Path
No revision
No revision
1.19.2.6 +4 -4
jakarta-tomcat/src/share/org/apache/jasper/compiler/Compiler.java
Index: Compiler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/Compiler.java,v
retrieving revision 1.19.2.5
retrieving revision 1.19.2.6
diff -u -r1.19.2.5 -r1.19.2.6
--- Compiler.java 2001/01/12 04:46:59 1.19.2.5
+++ Compiler.java 2001/03/09 23:35:25 1.19.2.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/Compiler.java,v 1.19.2.5
2001/01/12 04:46:59 larryi Exp $
- * $Revision: 1.19.2.5 $
- * $Date: 2001/01/12 04:46:59 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/Compiler.java,v 1.19.2.6
2001/03/09 23:35:25 marcsaeg Exp $
+ * $Revision: 1.19.2.6 $
+ * $Date: 2001/03/09 23:35:25 $
*
* ====================================================================
*
@@ -143,7 +143,7 @@
// - compiling the generated servlets (pass -encoding to javac).
// XXX - There are really three encodings of interest.
- String jspEncoding = "8859_1"; // default per JSP spec
+ String jspEncoding = "ISO-8859-1"; // default per JSP spec
// We try UTF8 by default. If it fails, we use the java encoding
// specified for JspServlet init parameter "javaEncoding".
1.17.2.4 +4 -4
jakarta-tomcat/src/share/org/apache/jasper/compiler/JspParseEventListener.java
Index: JspParseEventListener.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
retrieving revision 1.17.2.3
retrieving revision 1.17.2.4
diff -u -r1.17.2.3 -r1.17.2.4
--- JspParseEventListener.java 2000/12/22 19:33:08 1.17.2.3
+++ JspParseEventListener.java 2001/03/09 23:35:25 1.17.2.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.17.2.3 2000/12/22 19:33:08 pierred Exp $
- * $Revision: 1.17.2.3 $
- * $Date: 2000/12/22 19:33:08 $
+ * $Header:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v
1.17.2.4 2001/03/09 23:35:25 marcsaeg Exp $
+ * $Revision: 1.17.2.4 $
+ * $Date: 2001/03/09 23:35:25 $
*
* ====================================================================
*
@@ -324,7 +324,7 @@
else
writer.println("response.setContentType(\"" +
servletContentType +
- ";charset=8859_1\");");
+ ";charset=ISO-8859-1\");");
writer.println("pageContext = _jspxFactory.getPageContext(this, request,
response,\n"
+ "\t\t\t"
+ writer.quoteString(error) + ", "
1.16.2.7 +1 -1
jakarta-tomcat/src/share/org/apache/jasper/compiler/JspReader.java
Index: JspReader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspReader.java,v
retrieving revision 1.16.2.6
retrieving revision 1.16.2.7
diff -u -r1.16.2.6 -r1.16.2.7
--- JspReader.java 2000/12/22 19:33:08 1.16.2.6
+++ JspReader.java 2001/03/09 23:35:25 1.16.2.7
@@ -278,7 +278,7 @@
{
this.context = ctx;
this.encoding = encoding;
- if (this.encoding == null) this.encoding = "8859_1";
+ if (this.encoding == null) this.encoding = "ISO-8859-1";
pushFile(file, encoding);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
