From 45efe69f8019f9743aef4d2b4eb6acf56ea0551f Mon Sep 17 00:00:00 2001
From: Grace Kloba <klobag@google.com>
Date: Fri, 8 May 2009 19:21:55 -0700
Subject: [PATCH] Fix #1807059. If it is "POST", always use
 BasicHttpEntityEnclosingRequest even bodyProvider is null. This ensures the
 content-type, content-encoding and content-length are set correctly.

---
 core/java/android/net/http/Request.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/java/android/net/http/Request.java b/core/java/android/net/http/Request.java
index df4fff015dc0c..aeb85a2b1a4a2 100644
--- a/core/java/android/net/http/Request.java
+++ b/core/java/android/net/http/Request.java
@@ -116,12 +116,17 @@ class Request {
         mBodyProvider = bodyProvider;
         mBodyLength = bodyLength;
 
-        if (bodyProvider == null) {
+        if (bodyProvider == null && !"POST".equalsIgnoreCase(method)) {
             mHttpRequest = new BasicHttpRequest(method, getUri());
         } else {
             mHttpRequest = new BasicHttpEntityEnclosingRequest(
                     method, getUri());
-            setBodyProvider(bodyProvider, bodyLength);
+            // it is ok to have null entity for BasicHttpEntityEnclosingRequest.
+            // By using BasicHttpEntityEnclosingRequest, it will set up the
+            // correct content-length, content-type and content-encoding.
+            if (bodyProvider != null) {
+                setBodyProvider(bodyProvider, bodyLength);
+            }
         }
         addHeader(HOST_HEADER, getHostPort());