Merge "Properly deprecate HttpRequestHandlerRegistry#matchUriRequestPattern."
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 @@
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
diff --git a/src/org/apache/http/params/CoreProtocolPNames.java b/src/org/apache/http/params/CoreProtocolPNames.java
index a42c5de..a0a726d 100644
--- a/src/org/apache/http/params/CoreProtocolPNames.java
+++ b/src/org/apache/http/params/CoreProtocolPNames.java
@@ -94,8 +94,8 @@
/**
* <p>
- * Activates 'Expect: 100-Continue' handshake for the
- * entity enclosing methods. The purpose of the 'Expect: 100-Continue'
+ * Activates 'Expect: 100-continue' handshake for the
+ * entity enclosing methods. The purpose of the 'Expect: 100-continue'
* handshake to allow a client that is sending a request message with
* a request body to determine if the origin server is willing to
* accept the request (based on the request headers) before the client
diff --git a/src/org/apache/http/protocol/HTTP.java b/src/org/apache/http/protocol/HTTP.java
index de76ca6..9223955 100644
--- a/src/org/apache/http/protocol/HTTP.java
+++ b/src/org/apache/http/protocol/HTTP.java
@@ -60,7 +60,7 @@
public static final String SERVER_HEADER = "Server";
/** HTTP expectations */
- public static final String EXPECT_CONTINUE = "100-Continue";
+ public static final String EXPECT_CONTINUE = "100-continue";
/** HTTP connection control */
public static final String CONN_CLOSE = "Close";