Author: markt
Date: Tue May 11 19:51:45 2010
New Revision: 943250
URL: http://svn.apache.org/viewvc?rev=943250&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49227
Ensure case conversion behaves as expected
Patch provided by sebb
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=943250&r1=943249&r2=943250&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Tue May
11 19:51:45 2010
@@ -20,6 +20,7 @@ package org.apache.coyote.http11;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InterruptedIOException;
+import java.util.Locale;
import java.util.StringTokenizer;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.regex.Pattern;
@@ -1444,7 +1445,7 @@ public class Http11AprProcessor implemen
String encodingName = null;
while (commaPos != -1) {
encodingName = transferEncodingValue.substring
- (startPos, commaPos).toLowerCase().trim();
+ (startPos, commaPos).toLowerCase(Locale.ENGLISH).trim();
if (!addInputFilter(inputFilters, encodingName)) {
// Unsupported transfer encoding
error = true;
@@ -1455,7 +1456,7 @@ public class Http11AprProcessor implemen
commaPos = transferEncodingValue.indexOf(',', startPos);
}
encodingName = transferEncodingValue.substring(startPos)
- .toLowerCase().trim();
+ .toLowerCase(Locale.ENGLISH).trim();
if (!addInputFilter(inputFilters, encodingName)) {
// Unsupported transfer encoding
error = true;
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=943250&r1=943249&r2=943250&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Tue May
11 19:51:45 2010
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.io.InterruptedIOException;
import java.net.InetAddress;
import java.nio.channels.SelectionKey;
+import java.util.Locale;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.coyote.ActionCode;
@@ -933,7 +934,7 @@ public class Http11NioProcessor extends
String encodingName = null;
while (commaPos != -1) {
encodingName = transferEncodingValue.substring
- (startPos, commaPos).toLowerCase().trim();
+ (startPos, commaPos).toLowerCase(Locale.ENGLISH).trim();
if (!addInputFilter(inputFilters, encodingName)) {
// Unsupported transfer encoding
error = true;
@@ -944,7 +945,7 @@ public class Http11NioProcessor extends
commaPos = transferEncodingValue.indexOf(',', startPos);
}
encodingName = transferEncodingValue.substring(startPos)
- .toLowerCase().trim();
+ .toLowerCase(Locale.ENGLISH).trim();
if (!addInputFilter(inputFilters, encodingName)) {
// Unsupported transfer encoding
error = true;
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=943250&r1=943249&r2=943250&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue May 11
19:51:45 2010
@@ -23,6 +23,7 @@ import java.net.InetAddress;
import java.net.Socket;
import java.security.AccessController;
import java.security.PrivilegedAction;
+import java.util.Locale;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.coyote.ActionCode;
@@ -771,7 +772,7 @@ public class Http11Processor extends Abs
String encodingName = null;
while (commaPos != -1) {
encodingName = transferEncodingValue.substring
- (startPos, commaPos).toLowerCase().trim();
+ (startPos, commaPos).toLowerCase(Locale.ENGLISH).trim();
if (!addInputFilter(inputFilters, encodingName)) {
// Unsupported transfer encoding
error = true;
@@ -782,7 +783,7 @@ public class Http11Processor extends Abs
commaPos = transferEncodingValue.indexOf(',', startPos);
}
encodingName = transferEncodingValue.substring(startPos)
- .toLowerCase().trim();
+ .toLowerCase(Locale.ENGLISH).trim();
if (!addInputFilter(inputFilters, encodingName)) {
// Unsupported transfer encoding
error = true;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
