android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2026-01-18 20:40:58 +03:00
Code Releases Activity

Merge pull request #715 from square/jwilson_0418_remove_workaround

Browse Source 
Remove workaround for clients.google.com misconfiguration.
This commit is contained in:
Adrian Cole
2014-04-18 15:09:19 -04:00
parent a867db6457 9549fb4455
commit 8fe12e106e
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
okhttp/src/main/java/com/squareup/okhttp/internal/tls/OkHostnameVerifier.java
View File

@@ -179,10 +179,7 @@ public final class OkHostnameVerifier implements HostnameVerifier {
int suffixLength = cn.length() - (asterisk + 1);
int suffixStart = hostName.length() - suffixLength;
if (hostName.indexOf('.', asterisk) < suffixStart) {
// TODO: remove workaround for *.clients.google.com http://b/5426333
if (!hostName.endsWith(".clients.google.com")) {
return false; // wildcard '*' can't match a '.'
}
return false; // wildcard '*' can't match a '.'
}
if (!hostName.regionMatches(suffixStart, cn, asterisk + 1, suffixLength)) {