Merge "okhttp: add workaround in RequestTest for \r"

NamelessRom · Mar 11, 2016 · 12013c1 · 12013c1
2 parents 74b925d + 2a168a5
commit 12013c1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/okhttp-tests/src/test/java/com/squareup/okhttp/RequestTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/RequestTest.java
@@ -177,11 +177,11 @@ public final class RequestTest {
   @Test public void headerForbidsControlCharacters() throws Exception {
     assertForbiddenHeader(null);
     assertForbiddenHeader("\u0000");
-    assertForbiddenHeader("\r");
-    // Workaround for http://b/26422335
+    // Workaround for http://b/26422335 , http://b/26889631
     // assertForbiddenHeader("\n");
     assertForbiddenHeader("a\nb");
     assertForbiddenHeader("\nb");
+    // assertForbiddenHeader("\r");
     assertForbiddenHeader("a\rb");
     assertForbiddenHeader("\rb");
     // End of Android modification.