From 106f9b244633171ab75dd98b9761b7137c1a4705 Mon Sep 17 00:00:00 2001
From: Grace Kloba <klobag@google.com>
Date: Tue, 5 Jan 2010 10:50:39 -0800
Subject: [PATCH] Patch from Huahui Wu.

Fix http://b/issue?id=1908085
---
 core/java/android/net/http/DomainNameChecker.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/java/android/net/http/DomainNameChecker.java b/core/java/android/net/http/DomainNameChecker.java
index e4c8009774bec..3e01d2c67f392 100644
--- a/core/java/android/net/http/DomainNameChecker.java
+++ b/core/java/android/net/http/DomainNameChecker.java
@@ -231,7 +231,7 @@ public class DomainNameChecker {
                     rval = thisDomainTokens[i].equals(thatDomainTokens[i]);
                     if (!rval) {
                         // (c) OR we have a special *-match:
-                        // Z.Y.X matches *.Y.X but does not match *.X
+                        // *.Y.X matches Z.Y.X but *.X doesn't match Z.Y.X
                         rval = (i == 0 && thisDomainTokensNum == thatDomainTokensNum);
                         if (rval) {
                             rval = thatDomainTokens[0].equals("*");
@@ -242,10 +242,13 @@ public class DomainNameChecker {
                                     thisDomainTokens[0], thatDomainTokens[0]);
                             }
                         }
-
                         break;
                     }
                 }
+            } else {
+              // (e) OR thatHost has a '*.'-prefix of thisHost:
+              // *.Y.X matches Y.X
+              rval = thatDomain.equals("*." + thisDomain);
             }
         }