craigmcc 01/07/23 12:57:32
Modified: jasper/src/share/org/apache/jasper Constants.java
jasper/src/share/org/apache/jasper/compiler
TagBeginGenerator.java TagEndGenerator.java
Log:
Fix a spec compliance bug. Jasper was generating servlets that implicitly
imported "javax.servlet.jsp.tagext.*", even though this package is not on
the list of defined imports (JSP 1.2 PFD3b, page 50. Removed this
implicit import, and modified the code generators that depended on it.
PR: Bugtraq #4481010.
Revision Changes Path
1.13 +0 -1
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/Constants.java
Index: Constants.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/Constants.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Constants.java 2001/07/17 20:46:52 1.12
+++ Constants.java 2001/07/23 19:57:32 1.13
@@ -94,7 +94,6 @@
"javax.servlet.*",
"javax.servlet.http.*",
"javax.servlet.jsp.*",
- "javax.servlet.jsp.tagext.*",
"org.apache.jasper.runtime.*",
};
1.14 +4 -4
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagBeginGenerator.java
Index: TagBeginGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagBeginGenerator.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TagBeginGenerator.java 2001/04/26 23:17:40 1.13
+++ TagBeginGenerator.java 2001/07/23 19:57:32 1.14
@@ -353,7 +353,7 @@
// types of exceptions? -akv
if (!implementsBodyTag) {
- writer.println("if ("+evalVar+" == BodyTag.EVAL_BODY_BUFFERED)");
+ writer.println("if ("+evalVar+" ==
javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_BUFFERED)");
writer.pushIndent();
writer.println("throw new JspTagException(\"Since tag handler
"+tc.getTagHandlerClass()+
" does not implement BodyTag, it can't return
BodyTag.EVAL_BODY_TAG\");");
@@ -361,18 +361,18 @@
}
if (hasBody) {
- writer.println("if ("+evalVar+" != Tag.SKIP_BODY) {");
+ writer.println("if ("+evalVar+" !=
javax.servlet.jsp.tagext.Tag.SKIP_BODY) {");
writer.pushIndent();
if (implementsBodyTag) {
writer.println("try {");
writer.pushIndent();
- writer.println("if ("+evalVar+" != Tag.EVAL_BODY_INCLUDE) {");
+ writer.println("if ("+evalVar+" !=
javax.servlet.jsp.tagext.Tag.EVAL_BODY_INCLUDE) {");
writer.pushIndent();
writer.println("out = pageContext.pushBody();");
- writer.println(thVarName+".setBodyContent((BodyContent) out);");
+
writer.println(thVarName+".setBodyContent((javax.servlet.jsp.tagext.BodyContent)
out);");
writer.popIndent();
writer.println("}");
1.9 +3 -3
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagEndGenerator.java
Index: TagEndGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TagEndGenerator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TagEndGenerator.java 2001/07/11 20:17:42 1.8
+++ TagEndGenerator.java 2001/07/23 19:57:32 1.9
@@ -127,7 +127,7 @@
if (hasBody) {
if (implementsIterationTag)
- writer.println("} while ("+thVarName+".doAfterBody() ==
BodyTag.EVAL_BODY_AGAIN);");
+ writer.println("} while ("+thVarName+".doAfterBody() ==
javax.servlet.jsp.tagext.BodyTag.EVAL_BODY_AGAIN);");
else
writer.println("} while (false);");
}
@@ -150,7 +150,7 @@
writer.println("} finally {");
writer.pushIndent();
- writer.println("if ("+evalVarName+" != Tag.EVAL_BODY_INCLUDE)");
+ writer.println("if ("+evalVarName+" !=
javax.servlet.jsp.tagext.Tag.EVAL_BODY_INCLUDE)");
writer.pushIndent();
writer.println("out = pageContext.popBody();");
writer.popIndent();
@@ -163,7 +163,7 @@
writer.println("}");
}
- writer.println("if ("+thVarName+".doEndTag() == Tag.SKIP_PAGE)");
+ writer.println("if ("+thVarName+".doEndTag() ==
javax.servlet.jsp.tagext.Tag.SKIP_PAGE)");
writer.pushIndent(); writer.println("return;"); writer.popIndent();
writer.popIndent(); // try
