Author: markt
Date: Thu May 15 14:08:47 2008
New Revision: 656839
URL: http://svn.apache.org/viewvc?rev=656839&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44986
Page encoding consistency checks should be 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=656839&r1=656838&r2=656839&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu May 15 14:08:47 2008
@@ -57,12 +57,6 @@
+1: markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44986
- Page encoding consistency checks should be case insensitive
- http://svn.apache.org/viewvc?rev=656024&view=rev
- +1: markt, remm, fhanik
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44968
Provide more information when keystore load fails
http://svn.apache.org/viewvc?rev=656739&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=656839&r1=656838&r2=656839&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 May
15 14:08:47 2008
@@ -323,11 +323,12 @@
*
* @throws JasperException in case of page encoding mismatch
*/
- private String comparePageEncodings(String pageDirEnc,
+ private String comparePageEncodings(String thePageDirEnc,
Node.PageDirective pageDir) throws JasperException {
Node.Root root = pageDir.getRoot();
- String configEnc = root.getJspConfigPageEncoding();
+ String configEnc = root.getJspConfigPageEncoding().toUpperCase();
+ String pageDirEnc = thePageDirEnc.toUpperCase();
/*
* Compare the 'pageEncoding' attribute of the page directive with
@@ -355,7 +356,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=656839&r1=656838&r2=656839&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu May 15 14:08:47 2008
@@ -253,6 +253,10 @@
<fix>
<bug>44877</bug>: Prevent collisions on tag pool names. (markt)
</fix>
+ <fix>
+ <bug>44986</bug>: Make page encoding consistency checks
case-insensitive.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Webapps">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
