diff --git a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestStaleWhileRevalidationReleasesConnection.java b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestStaleWhileRevalidationReleasesConnection.java index 7db4806a5..129e3cde6 100644 --- a/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestStaleWhileRevalidationReleasesConnection.java +++ b/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestStaleWhileRevalidationReleasesConnection.java @@ -260,7 +260,7 @@ public class TestStaleWhileRevalidationReleasesConnection { final HttpContext context) throws HttpException, IOException { - final String method = request.getRequestLine().getMethod().toUpperCase(Locale.ENGLISH); + final String method = request.getRequestLine().getMethod().toUpperCase(Locale.ROOT); if (!"GET".equals(method) && !"POST".equals(method) && !"PUT".equals(method) diff --git a/httpclient-osgi/src/main/java/org/apache/http/osgi/impl/OSGiHttpRoutePlanner.java b/httpclient-osgi/src/main/java/org/apache/http/osgi/impl/OSGiHttpRoutePlanner.java index f57d68e53..2f0fe5f1b 100644 --- a/httpclient-osgi/src/main/java/org/apache/http/osgi/impl/OSGiHttpRoutePlanner.java +++ b/httpclient-osgi/src/main/java/org/apache/http/osgi/impl/OSGiHttpRoutePlanner.java @@ -131,12 +131,12 @@ final class OSGiHttpRoutePlanner extends DefaultRoutePlanner { private final String domainName; DomainNameMatcher(final String domainName) { - this.domainName = domainName.toLowerCase(Locale.ENGLISH); + this.domainName = domainName.toLowerCase(Locale.ROOT); } @Override public boolean matches(final String host) { - return host.toLowerCase(Locale.ENGLISH).endsWith(domainName); + return host.toLowerCase(Locale.ROOT).endsWith(domainName); } } diff --git a/httpclient/src/main/java/org/apache/http/auth/AuthScope.java b/httpclient/src/main/java/org/apache/http/auth/AuthScope.java index 1a0fd8474..a9e864d8e 100644 --- a/httpclient/src/main/java/org/apache/http/auth/AuthScope.java +++ b/httpclient/src/main/java/org/apache/http/auth/AuthScope.java @@ -104,10 +104,10 @@ public class AuthScope { public AuthScope(final String host, final int port, final String realm, final String scheme) { - this.host = (host == null) ? ANY_HOST: host.toLowerCase(Locale.ENGLISH); + this.host = (host == null) ? ANY_HOST: host.toLowerCase(Locale.ROOT); this.port = (port < 0) ? ANY_PORT: port; this.realm = (realm == null) ? ANY_REALM: realm; - this.scheme = (scheme == null) ? ANY_SCHEME: scheme.toUpperCase(Locale.ENGLISH); + this.scheme = (scheme == null) ? ANY_SCHEME: scheme.toUpperCase(Locale.ROOT); } /** @@ -266,7 +266,7 @@ public class AuthScope { public String toString() { final StringBuilder buffer = new StringBuilder(); if (this.scheme != null) { - buffer.append(this.scheme.toUpperCase(Locale.ENGLISH)); + buffer.append(this.scheme.toUpperCase(Locale.ROOT)); buffer.append(' '); } if (this.realm != null) { diff --git a/httpclient/src/main/java/org/apache/http/auth/NTCredentials.java b/httpclient/src/main/java/org/apache/http/auth/NTCredentials.java index c59e14483..b0a0c4e7c 100644 --- a/httpclient/src/main/java/org/apache/http/auth/NTCredentials.java +++ b/httpclient/src/main/java/org/apache/http/auth/NTCredentials.java @@ -75,7 +75,7 @@ public class NTCredentials implements Credentials, Serializable { final int atSlash = username.indexOf('/'); if (atSlash >= 0) { this.principal = new NTUserPrincipal( - username.substring(0, atSlash).toUpperCase(Locale.ENGLISH), + username.substring(0, atSlash).toUpperCase(Locale.ROOT), username.substring(atSlash + 1)); } else { this.principal = new NTUserPrincipal( @@ -104,7 +104,7 @@ public class NTCredentials implements Credentials, Serializable { this.principal = new NTUserPrincipal(domain, userName); this.password = password; if (workstation != null) { - this.workstation = workstation.toUpperCase(Locale.ENGLISH); + this.workstation = workstation.toUpperCase(Locale.ROOT); } else { this.workstation = null; } diff --git a/httpclient/src/main/java/org/apache/http/auth/NTUserPrincipal.java b/httpclient/src/main/java/org/apache/http/auth/NTUserPrincipal.java index 76a73be2a..82999395e 100644 --- a/httpclient/src/main/java/org/apache/http/auth/NTUserPrincipal.java +++ b/httpclient/src/main/java/org/apache/http/auth/NTUserPrincipal.java @@ -55,7 +55,7 @@ public class NTUserPrincipal implements Principal, Serializable { Args.notNull(username, "User name"); this.username = username; if (domain != null) { - this.domain = domain.toUpperCase(Locale.ENGLISH); + this.domain = domain.toUpperCase(Locale.ROOT); } else { this.domain = null; } diff --git a/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java b/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java index deb2a57f9..331cd6506 100644 --- a/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java +++ b/httpclient/src/main/java/org/apache/http/client/utils/URIUtils.java @@ -189,7 +189,7 @@ public class URIUtils { uribuilder.setPath("/"); } if (uribuilder.getHost() != null) { - uribuilder.setHost(uribuilder.getHost().toLowerCase(Locale.ENGLISH)); + uribuilder.setHost(uribuilder.getHost().toLowerCase(Locale.ROOT)); } uribuilder.setFragment(null); return uribuilder.build(); diff --git a/httpclient/src/main/java/org/apache/http/cookie/CookieOrigin.java b/httpclient/src/main/java/org/apache/http/cookie/CookieOrigin.java index e721f8118..39fb65d7c 100644 --- a/httpclient/src/main/java/org/apache/http/cookie/CookieOrigin.java +++ b/httpclient/src/main/java/org/apache/http/cookie/CookieOrigin.java @@ -50,7 +50,7 @@ public final class CookieOrigin { Args.notBlank(host, "Host"); Args.notNegative(port, "Port"); Args.notNull(path, "Path"); - this.host = host.toLowerCase(Locale.ENGLISH); + this.host = host.toLowerCase(Locale.ROOT); this.port = port; if (!path.trim().isEmpty()) { this.path = path; diff --git a/httpclient/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java b/httpclient/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java index 12c851347..126b421b4 100644 --- a/httpclient/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java +++ b/httpclient/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java @@ -137,7 +137,7 @@ public abstract class RFC2617Scheme extends AuthSchemeBase { if (name == null) { return null; } - return this.params.get(name.toLowerCase(Locale.ENGLISH)); + return this.params.get(name.toLowerCase(Locale.ROOT)); } /** diff --git a/httpclient/src/main/java/org/apache/http/impl/client/SystemDefaultCredentialsProvider.java b/httpclient/src/main/java/org/apache/http/impl/client/SystemDefaultCredentialsProvider.java index 79a74c0bc..a0265f009 100644 --- a/httpclient/src/main/java/org/apache/http/impl/client/SystemDefaultCredentialsProvider.java +++ b/httpclient/src/main/java/org/apache/http/impl/client/SystemDefaultCredentialsProvider.java @@ -54,11 +54,11 @@ public class SystemDefaultCredentialsProvider implements CredentialsProvider { static { SCHEME_MAP = new ConcurrentHashMap(); - SCHEME_MAP.put(AuthSchemes.BASIC.toUpperCase(Locale.ENGLISH), "Basic"); - SCHEME_MAP.put(AuthSchemes.DIGEST.toUpperCase(Locale.ENGLISH), "Digest"); - SCHEME_MAP.put(AuthSchemes.NTLM.toUpperCase(Locale.ENGLISH), "NTLM"); - SCHEME_MAP.put(AuthSchemes.SPNEGO.toUpperCase(Locale.ENGLISH), "SPNEGO"); - SCHEME_MAP.put(AuthSchemes.KERBEROS.toUpperCase(Locale.ENGLISH), "Kerberos"); + SCHEME_MAP.put(AuthSchemes.BASIC.toUpperCase(Locale.ROOT), "Basic"); + SCHEME_MAP.put(AuthSchemes.DIGEST.toUpperCase(Locale.ROOT), "Digest"); + SCHEME_MAP.put(AuthSchemes.NTLM.toUpperCase(Locale.ROOT), "NTLM"); + SCHEME_MAP.put(AuthSchemes.SPNEGO.toUpperCase(Locale.ROOT), "SPNEGO"); + SCHEME_MAP.put(AuthSchemes.KERBEROS.toUpperCase(Locale.ROOT), "Kerberos"); } private static String translateScheme(final String key) { diff --git a/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java b/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java index bfb1fbd37..e220d36f4 100644 --- a/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java +++ b/httpclient/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java @@ -196,7 +196,7 @@ public class BasicClientCookie implements SetCookie, ClientCookie, Cloneable, Se @Override public void setDomain(final String domain) { if (domain != null) { - cookieDomain = domain.toLowerCase(Locale.ENGLISH); + cookieDomain = domain.toLowerCase(Locale.ROOT); } else { cookieDomain = null; } diff --git a/httpclient/src/main/java/org/apache/http/impl/cookie/CookieSpecBase.java b/httpclient/src/main/java/org/apache/http/impl/cookie/CookieSpecBase.java index 0d1cdaa8e..c0329e0ae 100644 --- a/httpclient/src/main/java/org/apache/http/impl/cookie/CookieSpecBase.java +++ b/httpclient/src/main/java/org/apache/http/impl/cookie/CookieSpecBase.java @@ -84,7 +84,7 @@ public abstract class CookieSpecBase extends AbstractCookieSpec { final NameValuePair[] attribs = headerelement.getParameters(); for (int j = attribs.length - 1; j >= 0; j--) { final NameValuePair attrib = attribs[j]; - final String s = attrib.getName().toLowerCase(Locale.ENGLISH); + final String s = attrib.getName().toLowerCase(Locale.ROOT); cookie.setAttribute(s, attrib.getValue()); diff --git a/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDomainHandler.java b/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDomainHandler.java index 26c3f0d09..6ff119361 100644 --- a/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDomainHandler.java +++ b/httpclient/src/main/java/org/apache/http/impl/cookie/NetscapeDomainHandler.java @@ -81,7 +81,7 @@ public class NetscapeDomainHandler extends BasicDomainHandler { * @return True if the specified domain is "special" */ private static boolean isSpecialDomain(final String domain) { - final String ucDomain = domain.toUpperCase(Locale.ENGLISH); + final String ucDomain = domain.toUpperCase(Locale.ROOT); return ucDomain.endsWith(".COM") || ucDomain.endsWith(".EDU") || ucDomain.endsWith(".NET") diff --git a/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109DomainHandler.java b/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109DomainHandler.java index 0a3a177e7..f4988b247 100644 --- a/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109DomainHandler.java +++ b/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2109DomainHandler.java @@ -92,7 +92,7 @@ public class RFC2109DomainHandler implements CookieAttributeHandler { + domain + "\" violates RFC 2109: domain must contain an embedded dot"); } - host = host.toLowerCase(Locale.ENGLISH); + host = host.toLowerCase(Locale.ROOT); if (!host.endsWith(domain)) { throw new CookieRestrictionViolationException( "Illegal domain attribute \"" + domain diff --git a/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java b/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java index 6e352d18e..2b6c5686f 100644 --- a/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java +++ b/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java @@ -68,7 +68,7 @@ public class RFC2965DomainAttributeHandler implements CookieAttributeHandler { "Blank value for domain attribute"); } String s = domain; - s = s.toLowerCase(Locale.ENGLISH); + s = s.toLowerCase(Locale.ROOT); if (!domain.startsWith(".")) { // Per RFC 2965 section 3.2.2 // "... If an explicitly specified value does not start with @@ -110,12 +110,12 @@ public class RFC2965DomainAttributeHandler implements CookieAttributeHandler { throws MalformedCookieException { Args.notNull(cookie, "Cookie"); Args.notNull(origin, "Cookie origin"); - final String host = origin.getHost().toLowerCase(Locale.ENGLISH); + final String host = origin.getHost().toLowerCase(Locale.ROOT); if (cookie.getDomain() == null) { throw new CookieRestrictionViolationException("Invalid cookie state: " + "domain not specified"); } - final String cookieDomain = cookie.getDomain().toLowerCase(Locale.ENGLISH); + final String cookieDomain = cookie.getDomain().toLowerCase(Locale.ROOT); if (cookie instanceof ClientCookie && ((ClientCookie) cookie).containsAttribute(ClientCookie.DOMAIN_ATTR)) { @@ -171,7 +171,7 @@ public class RFC2965DomainAttributeHandler implements CookieAttributeHandler { public boolean match(final Cookie cookie, final CookieOrigin origin) { Args.notNull(cookie, "Cookie"); Args.notNull(origin, "Cookie origin"); - final String host = origin.getHost().toLowerCase(Locale.ENGLISH); + final String host = origin.getHost().toLowerCase(Locale.ROOT); final String cookieDomain = cookie.getDomain(); // The effective host name MUST domain-match the Domain diff --git a/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965Spec.java b/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965Spec.java index 46edb3b25..98862b30d 100644 --- a/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965Spec.java +++ b/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965Spec.java @@ -116,11 +116,11 @@ public class RFC2965Spec extends RFC2109Spec { new HashMap(attribs.length); for (int j = attribs.length - 1; j >= 0; j--) { final NameValuePair param = attribs[j]; - attribmap.put(param.getName().toLowerCase(Locale.ENGLISH), param); + attribmap.put(param.getName().toLowerCase(Locale.ROOT), param); } for (final Map.Entry entry : attribmap.entrySet()) { final NameValuePair attrib = entry.getValue(); - final String s = attrib.getName().toLowerCase(Locale.ENGLISH); + final String s = attrib.getName().toLowerCase(Locale.ROOT); cookie.setAttribute(s, attrib.getValue()); diff --git a/httpclient/src/test/java/org/apache/http/localserver/EchoHandler.java b/httpclient/src/test/java/org/apache/http/localserver/EchoHandler.java index 204bcaea1..380607e40 100644 --- a/httpclient/src/test/java/org/apache/http/localserver/EchoHandler.java +++ b/httpclient/src/test/java/org/apache/http/localserver/EchoHandler.java @@ -73,7 +73,7 @@ public class EchoHandler final HttpContext context) throws HttpException, IOException { - final String method = request.getRequestLine().getMethod().toUpperCase(Locale.ENGLISH); + final String method = request.getRequestLine().getMethod().toUpperCase(Locale.ROOT); if (!"GET".equals(method) && !"POST".equals(method) && !"PUT".equals(method) diff --git a/httpclient/src/test/java/org/apache/http/localserver/RandomHandler.java b/httpclient/src/test/java/org/apache/http/localserver/RandomHandler.java index 4e903b8a3..3fa5d9023 100644 --- a/httpclient/src/test/java/org/apache/http/localserver/RandomHandler.java +++ b/httpclient/src/test/java/org/apache/http/localserver/RandomHandler.java @@ -68,7 +68,7 @@ public class RandomHandler implements HttpRequestHandler { final HttpContext context) throws HttpException, IOException { - final String method = request.getRequestLine().getMethod().toUpperCase(Locale.ENGLISH); + final String method = request.getRequestLine().getMethod().toUpperCase(Locale.ROOT); if (!"GET".equals(method) && !"HEAD".equals(method)) { throw new MethodNotSupportedException (method + " not supported by " + getClass().getName());