Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 552346a7: am 106f9b24: Patch from Huahui Wu.

Browse Source 
Merge commit '552346a743be7c8b10893f817238e92938866999'

* commit '552346a743be7c8b10893f817238e92938866999':
  Patch from Huahui Wu.
This commit is contained in:
Grace Kloba
2010-01-05 11:32:52 -08:00
committed by Android Git Automerger
parent 364b42170d 552346a743
commit 5aded76004
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/net/http/DomainNameChecker.java
View File

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