42 lines
1.8 KiB
Diff
42 lines
1.8 KiB
Diff
# HG changeset patch
|
|
# User rhalade
|
|
# Date 1463420211 25200
|
|
# Mon May 16 10:36:51 2016 -0700
|
|
# Node ID c0e856f2dacdf5eb5cdea380da32ba210aee9579
|
|
# Parent fb617df8fbac42e962219e45cbd29b15b5ecdc63
|
|
8155049, PR3352: New tests from 8144566 fail with "No expected Server Name Indication"
|
|
Reviewed-by: xuelei
|
|
|
|
diff --git a/test/javax/net/ssl/ServerName/BestEffortOnLazyConnected.java b/test/javax/net/ssl/ServerName/BestEffortOnLazyConnected.java
|
|
--- openjdk/jdk/test/javax/net/ssl/ServerName/BestEffortOnLazyConnected.java
|
|
+++ openjdk/jdk/test/javax/net/ssl/ServerName/BestEffortOnLazyConnected.java
|
|
@@ -34,9 +34,6 @@
|
|
*/
|
|
|
|
import java.io.*;
|
|
-import java.nio.*;
|
|
-import java.nio.channels.*;
|
|
-import java.util.*;
|
|
import java.net.*;
|
|
import javax.net.ssl.*;
|
|
|
|
@@ -197,6 +194,7 @@
|
|
hostname);
|
|
// Ignore the test if the hostname does not sound like a domain name.
|
|
if ((hostname == null) || hostname.isEmpty() ||
|
|
+ !hostname.contains(".") || hostname.endsWith(".") ||
|
|
hostname.startsWith("localhost") ||
|
|
Character.isDigit(hostname.charAt(hostname.length() - 1))) {
|
|
|
|
diff --git a/test/sun/net/www/protocol/https/HttpsURLConnection/ImpactOnSNI.java b/test/sun/net/www/protocol/https/HttpsURLConnection/ImpactOnSNI.java
|
|
--- openjdk/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/ImpactOnSNI.java
|
|
+++ openjdk/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/ImpactOnSNI.java
|
|
@@ -235,6 +235,7 @@
|
|
hostname);
|
|
// Ignore the test if the hostname does not sound like a domain name.
|
|
if ((hostname == null) || hostname.isEmpty() ||
|
|
+ !hostname.contains(".") || hostname.endsWith(".") ||
|
|
hostname.startsWith("localhost") ||
|
|
Character.isDigit(hostname.charAt(hostname.length() - 1))) {
|
|
|