larryi 02/03/28 06:57:52
Modified: jasper/src/share/org/apache/jasper/compiler
CharDataGenerator.java
Log:
Port fix from Tomcat 3.3 for preserving '\r' line terminators.
Revision Changes Path
1.4 +6 -5
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/CharDataGenerator.java
Index: CharDataGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/CharDataGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CharDataGenerator.java 13 Jul 2001 19:17:07 -0000 1.3
+++ CharDataGenerator.java 28 Mar 2002 14:57:52 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/CharDataGenerator.java,v
1.3 2001/07/13 19:17:07 remm Exp $
- * $Revision: 1.3 $
- * $Date: 2001/07/13 19:17:07 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/CharDataGenerator.java,v
1.4 2002/03/28 14:57:52 larryi Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/03/28 14:57:52 $
*
* ====================================================================
*
@@ -108,7 +108,8 @@
sb.append("\\\\");
break;
case '\r':
- continue;
+ sb.append("\\r");
+ break;
/*
case '\'':
sb.append('\\');
@@ -116,7 +117,7 @@
break;
*/
case '\n':
- sb.append("\\r\\n");
+ sb.append("\\n");
break;
case '\t':
sb.append("\\t");
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
