You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ki...@apache.org on 2002/08/06 01:46:29 UTC
cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Compiler.java Validator.java
kinman 2002/08/05 16:46:29
Modified: jasper2/src/share/org/apache/jasper/compiler Compiler.java
Validator.java
Log:
- Fix bug in setting the default content type. Patch by Bob Herrmann.
Revision Changes Path
1.24 +5 -3 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java
Index: Compiler.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Compiler.java 3 Aug 2002 23:29:21 -0000 1.23
+++ Compiler.java 5 Aug 2002 23:46:28 -0000 1.24
@@ -387,6 +387,7 @@
return true;
}
+/* XXX turn off derived dependencies for now
// determine if compile time includes have been changed
if( jsw==null ) {
return false;
@@ -434,6 +435,7 @@
return true;
}
}
+*/
return false;
}
1.19 +4 -4 jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java
Index: Validator.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Validator.java 2 Aug 2002 19:30:02 -0000 1.18
+++ Validator.java 5 Aug 2002 23:46:29 -0000 1.19
@@ -858,7 +858,7 @@
String charset = pageInfo.getPageEncoding();
if (charset == null)
charset = isXml? "UTF-8": "ISO-8859-1";
- pageInfo.setContentType(defaultType + ";" + charset);
+ pageInfo.setContentType(defaultType + ";charset=" + charset);
}
/*
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>