commit 2abd308f1aae9e9eb28a3aa6d1386be446fc276b
author The Android Automerger <android-build@google.com> Sun May 29 00:03:54 2016 -0700
committer The Android Automerger <android-build@google.com> Sun May 29 00:03:54 2016 -0700
tree 47f57f41064ef5bc479c0821790b0acb7348e0cf
parent 75687ca5ae54f417afb4c02ba04767da6786d829
parent d54f93ee736a44b58b49b232882b325596ae6adc

merge in nyc-release history after reset to nyc-dev

okhttp-tests/src/test/java/com/squareup/okhttp/RequestTest.java

diff --git a/okhttp-tests/src/test/java/com/squareup/okhttp/RequestTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/RequestTest.java
index 40f4f0f..47c6010 100644
--- a/okhttp-tests/src/test/java/com/squareup/okhttp/RequestTest.java
+++ b/okhttp-tests/src/test/java/com/squareup/okhttp/RequestTest.java
@@ -188,8 +188,11 @@
     assertForbiddenHeader("\t");
     assertForbiddenHeader("\u001f");
     assertForbiddenHeader("\u007f");
-    assertForbiddenHeader("\u0080");
-    assertForbiddenHeader("\ud83c\udf69");
+
+    // ANDROID-BEGIN Workaround for http://b/28867041
+    // assertForbiddenHeader("\u0080");
+    // assertForbiddenHeader("\ud83c\udf69");
+    // ANDROID-END
   }
 
   private void assertForbiddenHeader(String s) {

okhttp-tests/src/test/java/com/squareup/okhttp/URLConnectionTest.java

diff --git a/okhttp-tests/src/test/java/com/squareup/okhttp/URLConnectionTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/URLConnectionTest.java
index 59cbc54..3598da0 100644
--- a/okhttp-tests/src/test/java/com/squareup/okhttp/URLConnectionTest.java
+++ b/okhttp-tests/src/test/java/com/squareup/okhttp/URLConnectionTest.java
@@ -2811,11 +2811,14 @@
       fail();
     } catch (IllegalArgumentException expected) {
     }
-    try {
-      connection.addRequestProperty("Name", "\u2615\ufe0f");
-      fail();
-    } catch (IllegalArgumentException expected) {
-    }
+
+    // ANDROID-BEGIN Disabled for http://b/28867041
+    // try {
+    //   connection.addRequestProperty("Name", "\u2615\ufe0f");
+    //   fail();
+    // } catch (IllegalArgumentException expected) {
+    // }
+    // ANDROID-END
   }
 
   @Test public void responseHeaderParsingIsLenient() throws Exception {

okhttp/src/main/java/com/squareup/okhttp/Headers.java

diff --git a/okhttp/src/main/java/com/squareup/okhttp/Headers.java b/okhttp/src/main/java/com/squareup/okhttp/Headers.java
index dad91bf..d5b4cef 100644
--- a/okhttp/src/main/java/com/squareup/okhttp/Headers.java
+++ b/okhttp/src/main/java/com/squareup/okhttp/Headers.java
@@ -304,7 +304,12 @@
 
       for (int i = 0, length = value.length(); i < length; i++) {
         char c = value.charAt(i);
-        if (c <= '\u001f' || c >= '\u007f') {
+        // ANDROID-BEGIN
+        // http://b/28867041 - keep things working for apps that rely on Android's (out of spec)
+        // UTF-8 header encoding behavior.
+        // if (c <= '\u001f' || c >= '\u007f') {
+        if (c <= '\u001f' || c == '\u007f') {
+        // ANDROID-END
           throw new IllegalArgumentException(String.format(
               "Unexpected char %#04x at %d in header value: %s", (int) c, i, value));
         }