5 files changed, 43 insertions, 15 deletions
diff --git a/lib/inets/src/http_client/httpc.erl b/lib/inets/src/http_client/httpc.erl
index ede649a5a9..64a60b82aa 100644
--- a/lib/inets/src/http_client/httpc.erl
+++ b/lib/inets/src/http_client/httpc.erl
@@ -163,8 +163,13 @@ request(Method,
 	{error, Reason} ->
 	    {error, Reason};
 	{ok, ParsedUrl} ->
-	    handle_request(Method, Url, ParsedUrl, Headers, [], [], 
-			   HTTPOptions, Options, Profile)
+	    case header_parse(Headers) of
+		{error, Reason} ->
+		    {error, Reason};
+		_ ->
+		    handle_request(Method, Url, ParsedUrl, Headers, [], [], 
+				   HTTPOptions, Options, Profile)
+	    end
     end;
      
 request(Method, 
@@ -1247,7 +1252,12 @@ uri_parse(URI, Opts) ->
 
 
 %%--------------------------------------------------------------------------
-    
+header_parse([]) ->
+    ok;
+header_parse([{Field, Value}|T]) when is_list(Field), is_list(Value) ->    
+    header_parse(T);
+header_parse(_) -> 
+    {error, {headers_error, not_strings}}.
 child_name2info(undefined) ->
     {error, no_such_service};
 child_name2info(httpc_manager) ->
diff --git a/lib/inets/src/http_client/httpc_response.erl b/lib/inets/src/http_client/httpc_response.erl
index f177aac8f2..9107dfbf05 100644
--- a/lib/inets/src/http_client/httpc_response.erl
+++ b/lib/inets/src/http_client/httpc_response.erl
@@ -430,8 +430,6 @@ format_response({StatusLine, Headers, Body}) ->
     Length = list_to_integer(Headers#http_response_h.'content-length'),
     {NewBody, Data} = 
 	case Length of
-	    0 ->
-		{Body, <<>>};
 	    -1 -> % When no lenght indicator is provided
 		{Body, <<>>};
 	    Length when (Length =< size(Body)) ->
diff --git a/lib/inets/src/http_lib/http_request.erl b/lib/inets/src/http_lib/http_request.erl
index c214aca4a4..fbfbe7c632 100644
--- a/lib/inets/src/http_lib/http_request.erl
+++ b/lib/inets/src/http_lib/http_request.erl
@@ -248,13 +248,8 @@ key_value_str(Key = 'content-language', Headers) ->
     key_value_str(atom_to_list(Key), 
 		    Headers#http_request_h.'content-language');
 key_value_str(Key = 'content-length', Headers) ->
-    case Headers#http_request_h.'content-length' of
-	"0" ->
-	    undefined;
-	_ -> 
-	    key_value_str(atom_to_list(Key), 
-			    Headers#http_request_h.'content-length')
-    end;
+    key_value_str(atom_to_list(Key), 
+		    Headers#http_request_h.'content-length');
 key_value_str(Key = 'content-location', Headers) ->
     key_value_str(atom_to_list(Key),
 		    Headers#http_request_h.'content-location');
diff --git a/lib/inets/test/http_format_SUITE.erl b/lib/inets/test/http_format_SUITE.erl
index 04c7358715..c913964094 100644
--- a/lib/inets/test/http_format_SUITE.erl
+++ b/lib/inets/test/http_format_SUITE.erl
@@ -35,14 +35,15 @@
 	  chunk_decode_trailer/1,
 	  http_response/1, http_request/1, validate_request_line/1,
 	  esi_parse_headers/1, cgi_parse_headers/1,
-	  is_absolut_uri/1, convert_netscapecookie_date/1]).
+	  is_absolut_uri/1, convert_netscapecookie_date/1,
+	  check_content_length_encoding/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [{group, chunk}, http_response, http_request,
      validate_request_line, {group, script}, is_absolut_uri,
-     convert_netscapecookie_date].
+     convert_netscapecookie_date, check_content_length_encoding].
 
 groups() -> 
     [{script, [], [esi_parse_headers, cgi_parse_headers]},
@@ -456,6 +457,25 @@ validate_request_line(Config) when is_list(Config) ->
 	httpd_request:validate("GET", NewForbiddenUri1, "HTTP/1.1"),
 
     ok.
+
+%%-------------------------------------------------------------------------
+check_content_length_encoding(doc) ->
+    ["Test http_request:headers/2. Check that the content-length is"
+     " encoded even when it is zero." ];
+check_content_length_encoding(suite) ->
+    [];
+check_content_length_encoding(Config) when is_list(Config) ->
+
+    %% Check that the content-length is preserved.
+    %% Sanity check.
+    Header1 = http_request:http_headers(#http_request_h{'content-length'="123"}),
+    true = (string:str(Header1, "content-length: 123\r\n") > 0),
+    %% Check that content-length=0 is handled correctly.
+    Header2 = http_request:http_headers(#http_request_h{'content-length'="0"}),
+    true = (string:str(Header2, "content-length: 0\r\n") > 0),
+
+    ok.
+
 %%-------------------------------------------------------------------------
 esi_parse_headers(doc) ->
     ["Test httpd_esi:*. All header values are received in the same"
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index 8df5964193..c20ec63448 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -83,7 +83,8 @@ real_requests()->
      stream_through_fun,
      stream_through_mfa,
      streaming_error,
-     inet_opts
+     inet_opts,
+     invalid_headers
     ].
 
 only_simulated() ->
@@ -795,6 +796,10 @@ headers_dummy(Config) when is_list(Config) ->
 
 %%-------------------------------------------------------------------------
 
+invalid_headers(Config) ->
+    Request  = {url(group_name(Config), "/dummy.html", Config), [{"cookie", undefined}]},
+    {error, _} = httpc:request(get, Request, [], []).
+
 remote_socket_close(Config) when is_list(Config) ->
     URL = url(group_name(Config), "/just_close.html", Config),
     {error, socket_closed_remotely} = httpc:request(URL).