/[Apache-SVN]
ViewVC logotype

Revision 1590848


Jump to revision: Previous Next
Author: kkolinko
Date: Tue Apr 29 00:19:33 2014 UTC (10 years ago)
Changed paths: 7
Log Message:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56334
Merged r1590842 from tomcat/trunk:
Additional tests and fixes
Includes the following:

1. Allow '\' in xmlns attributes of UninterpretedTag. A test added.

(Java escaping was missing. Xml-escaping is still missing. I think it is unlikely that anybody would use such values for xmlns attributes)

2. Fix interaction between Validator.ValidateVisitor.checkXmlAttributes(CustomTag ..) and getJspAttribute().

- EL expression was parsed twice in both methods. Now I am passing the already parsed EL.
- getJspAttribute() has EL validation code, so reduce duplication
- When calling getJspAttribute() you have to pass original attrs.getValue(i), not the textual value.

3. Fix Validator.ValidateVisitor.XmlEscapeNonELVisitor
- It was not EL-escaping its text. Tests added.

Changed paths

Path Details
Directorytomcat/tc7.0.x/trunk/ modified , props changed
Directorytomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/ELParser.java modified , text changed
Directorytomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Generator.java modified , text changed
Directorytomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Validator.java modified , text changed
Directorytomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestParser.java modified , text changed
Directorytomcat/tc7.0.x/trunk/test/webapp-3.0/bug5nnnn/bug56334.jspx modified , text changed
Directorytomcat/tc7.0.x/trunk/webapps/docs/changelog.xml modified , text changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26