Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x

This commit is contained in:
Greg Wilkins 2021-08-17 16:15:35 +10:00
parent b07c6f8dbe a5b1845e60
commit 9202ae4992
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTLSTest.java
View File

@ -60,7 +60,6 @@ import org.eclipse.jetty.server.SecureRequestCustomizer;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.SslConnectionFactory; import org.eclipse.jetty.server.SslConnectionFactory;
import org.eclipse.jetty.toolchain.test.Net;
import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.StringUtil;
import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.util.thread.ExecutorThreadPool; import org.eclipse.jetty.util.thread.ExecutorThreadPool;
@ -1029,6 +1028,7 @@ public class HttpClientTLSTest
.send(); .send();
assertEquals(HttpStatus.OK_200, response2.getStatus()); assertEquals(HttpStatus.OK_200, response2.getStatus());
/* TODO Fix. See #6624
if (Net.isIpv6InterfaceAvailable()) if (Net.isIpv6InterfaceAvailable())
{ {
// Send a request with SNI "[::1]", we should get the certificate at alias=ip. // Send a request with SNI "[::1]", we should get the certificate at alias=ip.
@ -1038,6 +1038,7 @@ public class HttpClientTLSTest
assertEquals(HttpStatus.OK_200, response3.getStatus()); assertEquals(HttpStatus.OK_200, response3.getStatus());
} }
*/
} }
@Test @Test

1
jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java
View File

@ -2178,6 +2178,7 @@ public abstract class SslContextFactory extends AbstractLifeCycle implements Dum
String host = sslEngine.getPeerHost(); String host = sslEngine.getPeerHost();
if (host != null) if (host != null)
{ {
// TODO Must handle : somehow as java17 SNIHostName never handles: See #6624
// Must use the byte[] constructor, because the character ':' is forbidden when // Must use the byte[] constructor, because the character ':' is forbidden when
// using the String constructor (but typically present in IPv6 addresses). // using the String constructor (but typically present in IPv6 addresses).
return List.of(new SNIHostName(host.getBytes(StandardCharsets.US_ASCII))); return List.of(new SNIHostName(host.getBytes(StandardCharsets.US_ASCII)));