You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ti...@apache.org on 2010/10/03 08:53:15 UTC
svn commit: r1003923 - in /tomcat/trunk:
java/org/apache/jasper/compiler/ParserController.java
webapps/docs/changelog.xml
Author: timw
Date: Sun Oct 3 06:53:15 2010
New Revision: 1003923
URL: http://svn.apache.org/viewvc?rev=1003923&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49998
Handle single quoted attributes in detection of jsp:root element in XML syntax JSP files.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java?rev=1003923&r1=1003922&r2=1003923&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java Sun Oct 3 06:53:15 2010
@@ -598,10 +598,12 @@ class ParserController implements TagCon
&& Character.isWhitespace(root.charAt(index))) {
index++;
}
- if (index < root.length() && root.charAt(index++) == '"'
- && root.regionMatches(index, JSP_URI, 0,
- JSP_URI.length())) {
- return true;
+ if (index < root.length()
+ && (root.charAt(index) == '"' || root.charAt(index) == '\'')) {
+ index++;
+ if (root.regionMatches(index, JSP_URI, 0, JSP_URI.length())) {
+ return true;
+ }
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1003923&r1=1003922&r2=1003923&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Oct 3 06:53:15 2010
@@ -244,6 +244,10 @@
<bug>49860</bug>: Add support for trailing headers in chunked HTTP
requests. (markt)
</fix>
+ <fix>
+ <bug>49987</bug>: Make jsp:root detection work with single quoted
+ attributes as well. (timw)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org