Merged branch 'jetty-9.3.x' into 'master'.

3 files changed, 14 insertions, 10 deletions

diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/ResetFrame.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/ResetFrame.java
index ec497008af..3e142371c7 100644
--- a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/ResetFrame.java
+++ b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/frames/ResetFrame.java
@@ -18,6 +18,8 @@
 
 package org.eclipse.jetty.http2.frames;
 
+import java.util.Locale;
+
 import org.eclipse.jetty.http2.ErrorCode;
 
 public class ResetFrame extends Frame
@@ -46,7 +48,7 @@ public class ResetFrame extends Frame
     public String toString()
     {
         ErrorCode errorCode = ErrorCode.from(error);
-        String reason = errorCode == null ? "error=" + error : errorCode.name().toLowerCase();
+        String reason = errorCode == null ? "error=" + error : errorCode.name().toLowerCase(Locale.ENGLISH);
         return String.format("%s#%d{%s}", super.toString(), streamId, reason);
     }
 }
diff --git a/jetty-http2/http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HuffmanTest.java b/jetty-http2/http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HuffmanTest.java
index 207a5e49f1..a8d53ddec1 100644
--- a/jetty-http2/http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HuffmanTest.java
+++ b/jetty-http2/http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HuffmanTest.java
@@ -19,6 +19,7 @@
 package org.eclipse.jetty.http2.hpack;
 
 import java.nio.ByteBuffer;
+import java.util.Locale;
 
 import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.TypeUtil;
@@ -37,7 +38,7 @@ public class HuffmanTest
             {"D.6.1l","9d29ad171863c78f0b97c8e9ae82ae43d3","https://www.example.com"},
             {"D.6.2te","640cff","303"},
         };
-    
+
     @Test
     public void testDecode() throws Exception
     {
@@ -48,7 +49,7 @@ public class HuffmanTest
             Assert.assertEquals(test[0],test[2],decoded);
         }
     }
-    
+
     @Test
     public void testDecodeTrailingFF() throws Exception
     {
@@ -59,7 +60,7 @@ public class HuffmanTest
             Assert.assertEquals(test[0],test[2],decoded);
         }
     }
-    
+
     @Test
     public void testEncode() throws Exception
     {
@@ -69,7 +70,7 @@ public class HuffmanTest
             int pos=BufferUtil.flipToFill(buf);
             Huffman.encode(buf,test[2]);
             BufferUtil.flipToFlush(buf,pos);
-            String encoded=TypeUtil.toHexString(BufferUtil.toArray(buf)).toLowerCase();
+            String encoded=TypeUtil.toHexString(BufferUtil.toArray(buf)).toLowerCase(Locale.ENGLISH);
             Assert.assertEquals(test[0],test[1],encoded);
             Assert.assertEquals(test[1].length()/2,Huffman.octetsNeeded(test[2]));
         }
@@ -82,7 +83,7 @@ public class HuffmanTest
         for (int i=0;i<bad.length;i++)
         {
             String s="bad '"+bad[i]+"'";
-            
+
             try
             {
                 Huffman.octetsNeeded(s);
@@ -91,7 +92,7 @@ public class HuffmanTest
             catch(IllegalArgumentException e)
             {
             }
-            
+
             try
             {
                 Huffman.encode(BufferUtil.allocate(32),s);
@@ -102,6 +103,6 @@ public class HuffmanTest
             }
         }
     }
-    
-    
+
+
 }
diff --git a/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpReceiverOverHTTP2.java b/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpReceiverOverHTTP2.java
index 51453e822a..21f5bb39b5 100644
--- a/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpReceiverOverHTTP2.java
+++ b/jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpReceiverOverHTTP2.java
@@ -19,6 +19,7 @@
 package org.eclipse.jetty.http2.client.http;
 
 import java.io.IOException;
+import java.util.Locale;
 
 import org.eclipse.jetty.client.HttpChannel;
 import org.eclipse.jetty.client.HttpExchange;
@@ -109,7 +110,7 @@ public class HttpReceiverOverHTTP2 extends HttpReceiver implements Stream.Listen
             return;
 
         ErrorCode error = ErrorCode.from(frame.getError());
-        String reason = error == null ? "reset" : error.name().toLowerCase();
+        String reason = error == null ? "reset" : error.name().toLowerCase(Locale.ENGLISH);
         exchange.getRequest().abort(new IOException(reason));
     }