Author: markt
Date: Thu Feb 12 14:47:01 2009
New Revision: 743769
URL: http://svn.apache.org/viewvc?rev=743769&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46564
Make page encoding test case insensitive
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=743769&r1=743768&r2=743769&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Feb 12 14:47:01 2009
@@ -124,12 +124,6 @@
+1: markt, fhanik
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46564
- Make page encoding test case insensitive
- http://svn.apache.org/viewvc?view=rev&revision=739176
- +1: markt, remm, jfclere
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46606
Make max depth configurable for WebDAV servlet
http://svn.apache.org/viewvc?rev=740635&view=rev
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java?rev=743769&r1=743768&r2=743769&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java Thu Feb
12 14:47:01 2009
@@ -376,16 +376,16 @@
* Compares page encodings specified in various places, and throws
* exception in case of page encoding mismatch.
*
- * @param pageDirEnc The value of the pageEncoding attribute of the
page
+ * @param thePageDirEnc The value of the pageEncoding attribute of the
page
* directive @param pageDir The page directive node
*
* @throws JasperException in case of page encoding mismatch
*/
- private void compareTagEncodings(String pageDirEnc,
+ private void compareTagEncodings(String thePageDirEnc,
Node.TagDirective pageDir) throws JasperException {
Node.Root root = pageDir.getRoot();
-
+ String pageDirEnc = thePageDirEnc.toUpperCase();
/*
* Compare the 'pageEncoding' attribute of the page directive with
* the encoding specified in the XML prolog (only for XML syntax,
@@ -394,7 +394,7 @@
* identical.
*/
if ((root.isXmlSyntax() && root.isEncodingSpecifiedInProlog()) ||
root.isBomPresent()) {
- String pageEnc = root.getPageEncoding();
+ String pageEnc = root.getPageEncoding().toUpperCase();
if (!pageDirEnc.equals(pageEnc)
&& (!pageDirEnc.startsWith("UTF-16") || !pageEnc
.startsWith("UTF-16"))) {
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=743769&r1=743768&r2=743769&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Feb 12 14:47:01 2009
@@ -409,6 +409,10 @@
<bug>46471</bug>: Fix naming clash when tags in different libraries
have
the same name. (markt)
</fix>
+ <fix>
+ <bug>46564</bug>: Make page encoding check for tagx compilation
+ case-insensitive. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Cluster">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
