From 1869bbee330b724eccc56ffa71a9fc6f44fd5e4f Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 11 May 2010 15:53:10 +0000 Subject: [PATCH] https://issues.apache.org/bugzilla/show_bug.cgi?id=49228 Use English Locale since other Locale's may give add results git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@943155 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/jasper/compiler/Validator.java | 11 ++++++----- java/org/apache/jasper/tagplugins/jstl/Util.java | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/java/org/apache/jasper/compiler/Validator.java b/java/org/apache/jasper/compiler/Validator.java index 8489e55c0..25a659dac 100644 --- a/java/org/apache/jasper/compiler/Validator.java +++ b/java/org/apache/jasper/compiler/Validator.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Hashtable; import java.util.Iterator; +import java.util.Locale; import javax.el.ELException; import javax.el.ExpressionFactory; @@ -330,7 +331,7 @@ class Validator { Node.Root root = pageDir.getRoot(); String configEnc = root.getJspConfigPageEncoding(); - String pageDirEnc = thePageDirEnc.toUpperCase(); + String pageDirEnc = thePageDirEnc.toUpperCase(Locale.ENGLISH); /* * Compare the 'pageEncoding' attribute of the page directive with @@ -339,7 +340,7 @@ class Validator { * "UTF-16LE" as identical. */ if (configEnc != null) { - configEnc = configEnc.toUpperCase(); + configEnc = configEnc.toUpperCase(Locale.ENGLISH); if (!pageDirEnc.equals(configEnc) && (!pageDirEnc.startsWith("UTF-16") || !configEnc .startsWith("UTF-16"))) { @@ -359,7 +360,7 @@ class Validator { * identical. */ if ((root.isXmlSyntax() && root.isEncodingSpecifiedInProlog()) || root.isBomPresent()) { - String pageEnc = root.getPageEncoding().toUpperCase(); + String pageEnc = root.getPageEncoding().toUpperCase(Locale.ENGLISH); if (!pageDirEnc.equals(pageEnc) && (!pageDirEnc.startsWith("UTF-16") || !pageEnc .startsWith("UTF-16"))) { @@ -387,7 +388,7 @@ class Validator { Node.TagDirective pageDir) throws JasperException { Node.Root root = pageDir.getRoot(); - String pageDirEnc = thePageDirEnc.toUpperCase(); + String pageDirEnc = thePageDirEnc.toUpperCase(Locale.ENGLISH); /* * Compare the 'pageEncoding' attribute of the page directive with * the encoding specified in the XML prolog (only for XML syntax, @@ -396,7 +397,7 @@ class Validator { * identical. */ if ((root.isXmlSyntax() && root.isEncodingSpecifiedInProlog()) || root.isBomPresent()) { - String pageEnc = root.getPageEncoding().toUpperCase(); + String pageEnc = root.getPageEncoding().toUpperCase(Locale.ENGLISH); if (!pageDirEnc.equals(pageEnc) && (!pageDirEnc.startsWith("UTF-16") || !pageEnc .startsWith("UTF-16"))) { diff --git a/java/org/apache/jasper/tagplugins/jstl/Util.java b/java/org/apache/jasper/tagplugins/jstl/Util.java index be3067bc9..bf6b2e58c 100644 --- a/java/org/apache/jasper/tagplugins/jstl/Util.java +++ b/java/org/apache/jasper/tagplugins/jstl/Util.java @@ -119,7 +119,7 @@ public class Util { public static String getContentTypeAttribute(String input, String name) { int begin; int end; - int index = input.toUpperCase().indexOf(name.toUpperCase()); + int index = input.toUpperCase(Locale.ENGLISH).indexOf(name.toUpperCase(Locale.ENGLISH)); if (index == -1) return null; index = index + name.length(); // positioned after the attribute name index = input.indexOf('=', index); // positioned at the '=' -- 2.11.0