You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@locus.apache.org on 2000/03/31 21:43:53 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/jasper/compiler JspParseEventListener.java JspUtil.java
mandar 00/03/31 11:43:52
Modified: src/share/org/apache/jasper/compiler
JspParseEventListener.java JspUtil.java
Log:
Bug fix for 82, 111:
Trying to escape characters such as * ? thus
creating invalid escape characters.
Bug fix for 32:
If you use a different encoding (non-default)
then some characters get garbaled.
Revision Changes Path
1.13 +11 -6 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JspParseEventListener.java 2000/03/28 04:29:47 1.12
+++ JspParseEventListener.java 2000/03/31 19:43:52 1.13
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v 1.12 2000/03/28 04:29:47 akv Exp $
- * $Revision: 1.12 $
- * $Date: 2000/03/28 04:29:47 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v 1.13 2000/03/31 19:43:52 mandar Exp $
+ * $Revision: 1.13 $
+ * $Date: 2000/03/31 19:43:52 $
*
* ====================================================================
*
@@ -297,9 +297,14 @@
writer.println("}");
writer.println("_jspxFactory = JspFactory.getDefaultFactory();");
- writer.println("response.setContentType("
- + writer.quoteString(servletContentType)
- + ");");
+ if (this.contentTypeDir == true)
+ writer.println("response.setContentType(" +
+ writer.quoteString(servletContentType)
+ + ");");
+ else
+ writer.println("response.setContentType(\"" +
+ servletContentType +
+ ";charset=8859_1\");");
writer.println("pageContext = _jspxFactory.getPageContext(this, request, response,\n"
+ "\t\t\t"
+ writer.quoteString(error) + ", "
1.10 +4 -4 jakarta-tomcat/src/share/org/apache/jasper/compiler/JspUtil.java
Index: JspUtil.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspUtil.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JspUtil.java 2000/03/28 19:16:12 1.9
+++ JspUtil.java 2000/03/31 19:43:52 1.10
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspUtil.java,v 1.9 2000/03/28 19:16:12 akv Exp $
- * $Revision: 1.9 $
- * $Date: 2000/03/28 19:16:12 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspUtil.java,v 1.10 2000/03/31 19:43:52 mandar Exp $
+ * $Revision: 1.10 $
+ * $Date: 2000/03/31 19:43:52 $
*
* ====================================================================
*
@@ -236,7 +236,7 @@
return null;
String escString = "";
- String shellSpChars = "&;`'\"|*?~<>^()[]{}$\\\n";
+ String shellSpChars = "\\\"";
for(int index=0; index<unescString.length(); index++) {
char nextChar = unescString.charAt(index);