Merge branch 'peterdmv/inets/httpc-content-type/ERL-736/OTP-15339' into maint

* peterdmv/inets/httpc-content-type/ERL-736/OTP-15339:
  inets: Fix handling of 'Content-Type' (httpc)

Change-Id: I8c9f48d8474dba7a83e4ecba6b8146faffb559fc

2 files changed, 20 insertions, 2 deletions

diff --git a/lib/inets/src/http_client/httpc_request.erl b/lib/inets/src/http_client/httpc_request.erl
index 9db961cf9e..0f20d93bc1 100644
--- a/lib/inets/src/http_client/httpc_request.erl
+++ b/lib/inets/src/http_client/httpc_request.erl
@@ -213,9 +213,11 @@ update_body(Headers, Body) ->
 update_headers(Headers, ContentType, Body, []) ->
     case Body of
         [] ->
-            Headers#http_request_h{'content-length' = "0"};
+            Headers1 = Headers#http_request_h{'content-length' = "0"},
+            handle_content_type(Headers1, ContentType);
         <<>> ->
-            Headers#http_request_h{'content-length' = "0"};
+            Headers1 = Headers#http_request_h{'content-length' = "0"},
+            handle_content_type(Headers1, ContentType);
         {Fun, _Acc} when is_function(Fun, 1) ->
             %% A client MUST NOT generate a 100-continue expectation in a request
             %% that does not include a message body. This implies that either the
@@ -245,6 +247,12 @@ body_length(Body) when is_binary(Body) ->
 body_length(Body) when is_list(Body) ->
   integer_to_list(length(Body)).
 
+%% Set 'Content-Type' when it is explicitly set.
+handle_content_type(Headers, "") ->
+    Headers;
+handle_content_type(Headers, ContentType) ->
+    Headers#http_request_h{'content-type' = ContentType}.
+
 method(Method) ->
     http_util:to_upper(atom_to_list(Method)).
 
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index 41f8b60363..8357e02014 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -156,6 +156,7 @@ only_simulated() ->
      multipart_chunks,
      get_space,
      delete_no_body,
+     post_with_content_type,
      stream_fun_server_close
     ].
 
@@ -1601,6 +1602,15 @@ delete_no_body(Config) when is_list(Config) ->
         httpc:request(delete, {URL, [], "text/plain", "TEST"}, [], []).
 
 %%--------------------------------------------------------------------
+post_with_content_type(doc) ->
+    ["Test that a POST request with explicit 'Content-Type' does not drop the 'Content-Type' header - Solves ERL-736"];
+post_with_content_type(Config) when is_list(Config) ->
+    URL = url(group_name(Config), "/delete_no_body.html", Config),
+    %% Simulated server replies 500 if 'Content-Type' header is present
+    {ok, {{_,500,_}, _, _}} =
+        httpc:request(post, {URL, [], "application/x-www-form-urlencoded", ""}, [], []).
+
+%%--------------------------------------------------------------------
 request_options() ->
     [{doc, "Test http get request with socket options against local server (IPv6)"}].
 request_options(Config) when is_list(Config) ->