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/05 22:27:02 UTC

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

mandar      00/03/05 13:27:02

  Modified:    src/share/org/apache/jasper/compiler Tag: latest_TOMCAT_30
                        JspParseEventListener.java
  Log:
  Encoding fix to the patch.
  The default encoding is 8859_1
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4.4.1   +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.4
  retrieving revision 1.4.4.1
  diff -u -r1.4 -r1.4.4.1
  --- JspParseEventListener.java	1999/10/21 21:50:20	1.4
  +++ JspParseEventListener.java	2000/03/05 21:27:01	1.4.4.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v 1.4 1999/10/21 21:50:20 mandar Exp $
  - * $Revision: 1.4 $
  - * $Date: 1999/10/21 21:50:20 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/JspParseEventListener.java,v 1.4.4.1 2000/03/05 21:27:01 mandar Exp $
  + * $Revision: 1.4.4.1 $
  + * $Date: 2000/03/05 21:27:01 $
    *
    * ====================================================================
    * 
  @@ -287,9 +287,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) + ", "