Author: markt
Date: Sun Apr 11 13:44:50 2010
New Revision: 932898
URL: http://svn.apache.org/viewvc?rev=932898&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
Add system property to allow disabling enforcement of JSP.5.3. The spec
recommends, but does not require this enforcement. (kkolinko)
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=932898&r1=932897&r2=932898&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Apr 11 13:44:50 2010
@@ -113,13 +113,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48701
- Add system property to allow disabling enforcement of JSP.5.3
- The spec recommends, but does not require this enforcement.
- http://svn.apache.org/viewvc?rev=920880&view=rev
- +1: kkolinko, markt, rjung
- -1:
-
* Address https://issues.apache.org/bugzilla/show_bug.cgi?id=48007#c5
Improve exception processing in CustomObjectInputStream#resolveClass(),
to help find the cause behind BZ 48007.
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?rev=932898&r1=932897&r2=932898&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java Sun Apr
11 13:44:50 2010
@@ -78,6 +78,15 @@ class Generator {
private static final String VAR_ANNOTATIONPROCESSOR =
System.getProperty("org.apache.jasper.compiler.Generator.VAR_ANNOTATIONPROCESSOR",
"_jsp_annotationprocessor");
+ /* System property that controls if the requirement to have the object
+ * used in jsp:getProperty action to be previously "introduced"
+ * to the JSP processor (see JSP.5.3) is enforced.
+ */
+ private static final boolean STRICT_GET_PROPERTY = Boolean.valueOf(
+ System.getProperty(
+ "org.apache.jasper.compiler.Generator.STRICT_GET_PROPERTY",
+ "true")).booleanValue();
+
private ServletWriter out;
private ArrayList methodsBuffered;
@@ -1064,7 +1073,7 @@ class Generator {
+ ")_jspx_page_context.findAttribute("
+ "\""
+ name + "\"))." + methodName + "())));");
- } else if (varInfoNames.contains(name)) {
+ } else if (!STRICT_GET_PROPERTY || varInfoNames.contains(name)) {
// The object is a custom action with an associated
// VariableInfo entry for this name.
// Get the class name and then introspect at runtime.
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=932898&r1=932897&r2=932898&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Apr 11 13:44:50 2010
@@ -78,6 +78,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <bug>48701</bug>: Add a system property to allow disabling enforcement
+ of JSP.5.3. The specification recommends, but does not require, this
+ enforcement. (kkolinko)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<update>Update to Commons Daemon 1.0.2. Use service launcher (procrun)
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml?rev=932898&r1=932897&r2=932898&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml Sun Apr 11
13:44:50 2010
@@ -80,6 +80,14 @@
be used.</p>
</property>
+ <property name="org.apache.jasper.compiler. Generator.STRICT_GET_PROPERTY">
+ <p>If <code>true</code>, the requirement to have the object referenced in
+ <code>jsp:getProperty</code> action to be previously "introduced"
+ to the JSP processor, as specified in the chapter JSP.5.3 of JSP 2.0 and
+ later specifications, is enforced. If not specified, the specification
+ compliant default of <code>true</code> will be used.</p>
+ </property>
+
<property name="org.apache.jasper.compiler. Parser.STRICT_QUOTE_ESCAPING">
<p>If <code>false</code> the requirements for escaping quotes in JSP
attributes will be relaxed so that an unescaped quote will not
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
