luehe 2003/02/25 17:57:30
Modified: jasper2/src/share/org/apache/jasper/compiler Validator.java
jasper2/src/share/org/apache/jasper/resources
messages.properties
Log:
Fixed 17398: Jasper incorrectly allows a page author to specify a body
for jsp:output in a JSP document.
Revision Changes Path
1.82 +7 -3
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.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- Validator.java 26 Feb 2003 01:32:20 -0000 1.81
+++ Validator.java 26 Feb 2003 01:57:30 -0000 1.82
@@ -951,6 +951,10 @@
public void visit(Node.JspOutput n) throws JasperException {
JspUtil.checkAttributes("jsp:output", n, jspOutputAttrs, err);
+ if (n.getBody() != null) {
+ err.jspError(n, "jsp.error.jspoutput.nonemptybody");
+ }
+
if (pageInfo.getOmitXmlDecl() != null) {
err.jspError(n, "jsp.error.multiple.jspoutput");
}
1.100 +2 -1
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties
Index: messages.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/resources/messages.properties,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- messages.properties 24 Feb 2003 23:43:59 -0000 1.99
+++ messages.properties 26 Feb 2003 01:57:30 -0000 1.100
@@ -355,6 +355,7 @@
jsp.error.xml.closeQuoteMissingInXMLDecl = closing quote in the value following
\"{0}\" in the XML declaration is missing.
jsp.error.xml.invalidHighSurrogate = High surrogate bits in UTF-8 sequence must not
exceed 0x10 but found 0x{0}.
jsp.error.multiple.jspoutput = Cannot have multiple occurrences of
<jsp:output>
+jsp.error.jspoutput.nonemptybody=<jsp:output> must not have a body
jsp.error.attributes.not.allowed = {0} must not have any attributes
jsp.error.tagfile.badSuffix=Missing \".tag\" suffix in tag file path {0}
jsp.error.tagfile.illegalPath=Illegal tag file path: {0}, must start with
\"/WEB-INF/tags\" or \"/META-INF/tags\"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
