summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Wilson <jessewilson@google.com>2010-05-06 14:42:10 -0700
committerJesse Wilson <jessewilson@google.com>2010-05-06 14:42:10 -0700
commitffdb17578754105930c12cf7989a06914b96190f (patch)
tree61e8cd37ba922ce8fd05f4e7fd0a36a665bad906
parentaf5c56d18c8e1e32552c7d31a2f365b506c28e59 (diff)
downloadexternal_apache-http-ffdb17578754105930c12cf7989a06914b96190f.zip
external_apache-http-ffdb17578754105930c12cf7989a06914b96190f.tar.gz
external_apache-http-ffdb17578754105930c12cf7989a06914b96190f.tar.bz2
Turning off expect-continue by default in Apache HTTP client.
Change-Id: I24d9950e23596770c4b2835f3f3c23ced9cb7651 http://b/2471595
-rw-r--r--src/org/apache/http/impl/client/DefaultHttpClient.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/org/apache/http/impl/client/DefaultHttpClient.java b/src/org/apache/http/impl/client/DefaultHttpClient.java
index f0b694e..7dcb2a2 100644
--- a/src/org/apache/http/impl/client/DefaultHttpClient.java
+++ b/src/org/apache/http/impl/client/DefaultHttpClient.java
@@ -131,8 +131,15 @@ public class DefaultHttpClient extends AbstractHttpClient {
HttpVersion.HTTP_1_1);
HttpProtocolParams.setContentCharset(params,
HTTP.DEFAULT_CONTENT_CHARSET);
+
+ /*
+ * Android note: Send each request body without first asking the server
+ * whether it will be accepted. Asking first slows down the common case
+ * and results in "417 expectation failed" errors when a HTTP/1.0 server
+ * is behind a proxy. http://b/2471595
+ */
HttpProtocolParams.setUseExpectContinue(params,
- true);
+ false); // android-changed
// determine the release version from packaged version info
final VersionInfo vi = VersionInfo.loadVersionInfo