From 7de856fa168fff5740e229d3a4ffa00c2942c56a Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 13 May 2008 21:40:59 +0000 Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44986 Convert to upper case before comparing encoding names git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@656024 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/jasper/compiler/Validator.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/java/org/apache/jasper/compiler/Validator.java b/java/org/apache/jasper/compiler/Validator.java index 3b630463b..e97b02d08 100644 --- a/java/org/apache/jasper/compiler/Validator.java +++ b/java/org/apache/jasper/compiler/Validator.java @@ -322,11 +322,12 @@ class Validator { * * @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 @@ -354,7 +355,7 @@ class Validator { * 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"))) { -- 2.11.0