You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by la...@apache.org on 2002/03/28 15:57:13 UTC

cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler CharDataGenerator.java

larryi      02/03/28 06:57:13

  Modified:    jasper/src/share/org/apache/jasper/compiler Tag:
                        tomcat_40_branch CharDataGenerator.java
  Log:
  Port fix from Tomcat 3.3 for preserving '\r' line terminators.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.1   +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.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- CharDataGenerator.java	13 Jul 2001 19:17:07 -0000	1.3
  +++ CharDataGenerator.java	28 Mar 2002 14:57:12 -0000	1.3.2.1
  @@ -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.3.2.1 2002/03/28 14:57:12 larryi Exp $
  + * $Revision: 1.3.2.1 $
  + * $Date: 2002/03/28 14:57:12 $
    *
    * ====================================================================
    * 
  @@ -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:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>