This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new cd14b39 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63966
cd14b39 is described below
commit cd14b3982ab7e92e638e24afa455e6f97c0c9890
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jan 6 21:25:45 2020 +0000
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63966
Switch the message shown when using HTTP to connect to an HTTPS port
from ISO-8859-1 to UTF-8. This is consistent with Tomcat's use of UTF-8
by default elsewhere and also results in marginally smaller headers.
---
java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java | 4 ++--
webapps/docs/changelog.xml | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java
b/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java
index 00fbd89..6ce27cb 100644
--- a/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java
+++ b/java/org/apache/tomcat/util/net/TLSClientHelloExtractor.java
@@ -49,11 +49,11 @@ public class TLSClientHelloExtractor {
private static final int TLS_EXTENSION_ALPN = 16;
public static byte[] USE_TLS_RESPONSE = ("HTTP/1.1 400 \r\n" +
- "Content-Type: text/plain;charset=ISO-8859-1\r\n" +
+ "Content-Type: text/plain;charset=UTF-8\r\n" +
"Connection: close\r\n" +
"\r\n" +
"Bad Request\r\n" +
- "This combination of host and port requires
TLS.\r\n").getBytes(StandardCharsets.ISO_8859_1);
+ "This combination of host and port requires
TLS.\r\n").getBytes(StandardCharsets.UTF_8);
/**
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3a54774..c013b2f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -106,6 +106,10 @@
<code>SSLHostConfigCertificate</code> elements. (markt)
</fix>
<fix>
+ <bug>63966</bug>: Switch the message shown when using HTTP to connect
to
+ an HTTPS port from ISO-8859-1 to UTF-8. (markt)
+ </fix>
+ <fix>
<bug>64007</bug>: Cancel selection key in poller before wrapper close
to
avoid possible deadlock. (remm)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
