summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2011-04-01 15:05:21 -0700
committerBrian Carlstrom <bdc@google.com>2011-04-01 15:05:21 -0700
commit81d5133bb7843bc65c5321e53f5017ce2e4d13af (patch)
treebf26f9314a4b256c1ec9c9e50ed18bd6044e71a7
parent403f11d92b25f7c3060b1a973d4076c5d6585ccf (diff)
parent177cd647c9fa02329fb9800f71282b233170f986 (diff)
downloadexternal_apache-http-81d5133bb7843bc65c5321e53f5017ce2e4d13af.zip
external_apache-http-81d5133bb7843bc65c5321e53f5017ce2e4d13af.tar.gz
external_apache-http-81d5133bb7843bc65c5321e53f5017ce2e4d13af.tar.bz2
Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master
-rw-r--r--src/org/apache/http/conn/ssl/AbstractVerifier.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/org/apache/http/conn/ssl/AbstractVerifier.java b/src/org/apache/http/conn/ssl/AbstractVerifier.java
index e409db9..723d806 100644
--- a/src/org/apache/http/conn/ssl/AbstractVerifier.java
+++ b/src/org/apache/http/conn/ssl/AbstractVerifier.java
@@ -163,7 +163,7 @@ public abstract class AbstractVerifier implements X509HostnameVerifier {
// action. It also can't be [*.co.uk] or [*.co.jp] or
// [*.org.uk], etc...
boolean doWildcard = cn.startsWith("*.") &&
- cn.lastIndexOf('.') >= 0 &&
+ cn.indexOf('.', 2) != -1 &&
acceptableCountryWildcard(cn) &&
!InetAddressUtils.isIPv4Address(host);