commit 81d5133bb7843bc65c5321e53f5017ce2e4d13af
author Brian Carlstrom <bdc@google.com> Fri Apr 01 15:05:21 2011 -0700
committer Brian Carlstrom <bdc@google.com> Fri Apr 01 15:05:21 2011 -0700
tree bf26f9314a4b256c1ec9c9e50ed18bd6044e71a7
parent 403f11d92b25f7c3060b1a973d4076c5d6585ccf
parent 177cd647c9fa02329fb9800f71282b233170f986

Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master

src/org/apache/http/conn/ssl/AbstractVerifier.java

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 @@
             // 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);