commit 322c9cf426a4b809b0b4bc3e739d878ab1dce6a5
author Neil Fuller <nfuller@google.com> Fri Nov 07 17:08:58 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 07 17:08:59 2014 +0000
tree 8c897ff491c410cae54e502ff3587cdcfbacc9c8
parent b7e0e0a36f9d15086401f2e87fd8a97b8cec7bad
parent 007b88ad6df622a2e5daacce604637d006ed6212

Merge "Add further handling for when a CONNECT incorrectly returns a body."

okhttp/src/main/java/com/squareup/okhttp/internal/tls/OkHostnameVerifier.java

diff --git a/okhttp/src/main/java/com/squareup/okhttp/internal/tls/OkHostnameVerifier.java b/okhttp/src/main/java/com/squareup/okhttp/internal/tls/OkHostnameVerifier.java
index 326872a..a08773f 100644
--- a/okhttp/src/main/java/com/squareup/okhttp/internal/tls/OkHostnameVerifier.java
+++ b/okhttp/src/main/java/com/squareup/okhttp/internal/tls/OkHostnameVerifier.java
@@ -179,7 +179,10 @@
     int suffixLength = cn.length() - (asterisk + 1);
     int suffixStart = hostName.length() - suffixLength;
     if (hostName.indexOf('.', asterisk) < suffixStart) {
-      return false; // wildcard '*' can't match a '.'
+      // TODO: remove workaround for *.clients.google.com http://b/5426333
+      if (!hostName.endsWith(".clients.google.com")) {
+        return false; // wildcard '*' can't match a '.'
+      }
     }
 
     if (!hostName.regionMatches(suffixStart, cn, asterisk + 1, suffixLength)) {