Author: markt
Date: Wed Dec 6 19:28:28 2017
New Revision: 1817314
URL: http://svn.apache.org/viewvc?rev=1817314&view=rev
Log:
Follow-up to r1817302
Modified:
tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java
Modified: tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java?rev=1817314&r1=1817313&r2=1817314&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestRequest.java Wed Dec 6
19:28:28 2017
@@ -24,6 +24,9 @@ import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.nio.charset.UnsupportedCharsetException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Enumeration;
@@ -931,7 +934,13 @@ public class TestRequest extends TomcatB
tomcat.start();
- byte[] body = "Test".getBytes(userAgentCharaceterEncoding);
+ Charset charset = StandardCharsets.ISO_8859_1;
+ try {
+ charset = Charset.forName(userAgentCharaceterEncoding);
+ } catch (UnsupportedCharsetException e) {
+ // Ignore - use default set above
+ }
+ byte[] body = "Test".getBytes(charset);
ByteChunk bc = new ByteChunk();
Map<String,List<String>> reqHeaders = new HashMap<>();
reqHeaders.put("Content-Type",
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
