summaryrefslogtreecommitdiffstats
path: root/support
diff options
context:
space:
mode:
authorJesse Wilson <jessewilson@google.com>2011-04-30 09:48:58 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-04-30 09:48:58 -0700
commitd02c73b1db5e11d4d0b03da536e4d99a857b0c23 (patch)
treeafb714f58e39d83ba839504d97dc05dfc320bd18 /support
parentd7a21ec11a89594497f35f731b42d98af72e1235 (diff)
parentadb64fbba2b781467e055706c3de0873dfc01166 (diff)
downloadlibcore-d02c73b1db5e11d4d0b03da536e4d99a857b0c23.zip
libcore-d02c73b1db5e11d4d0b03da536e4d99a857b0c23.tar.gz
libcore-d02c73b1db5e11d4d0b03da536e4d99a857b0c23.tar.bz2
Merge "Honor max-age and min-fresh request headers." into dalvik-dev
Diffstat (limited to 'support')
-rw-r--r--support/src/test/java/tests/http/MockWebServer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/support/src/test/java/tests/http/MockWebServer.java b/support/src/test/java/tests/http/MockWebServer.java
index 6de6c51..2d8215c 100644
--- a/support/src/test/java/tests/http/MockWebServer.java
+++ b/support/src/test/java/tests/http/MockWebServer.java
@@ -360,7 +360,7 @@ public final class MockWebServer {
if (request.startsWith("OPTIONS ") || request.startsWith("GET ")
|| request.startsWith("HEAD ") || request.startsWith("DELETE ")
- || request .startsWith("TRACE ")) {
+ || request .startsWith("TRACE ") || request.startsWith("CONNECT ")) {
if (hasBody) {
throw new IllegalArgumentException("Request must not have a body: " + request);
}