2 files changed, 57 insertions, 3 deletions
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..350192464e 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -83,12 +83,14 @@ real_requests()->
      stream_through_fun,
      stream_through_mfa,
      streaming_error,
-     inet_opts
+     inet_opts,
+     invalid_headers
     ].
 
 only_simulated() ->
     [
      cookie,
+     cookie_profile,
      trace,
      stream_once,
      no_content_204,
@@ -488,9 +490,37 @@ cookie(Config) when is_list(Config) ->
     {ok, {{_,200,_}, [_ | _], [_|_]}}
 	= httpc:request(get, Request1, [], []),
 
+   [{session_cookies, [_|_]}] = httpc:which_cookies(httpc:default_profile()),
+
     ets:delete(cookie),
     ok = httpc:set_options([{cookies, disabled}]).
 
+
+
+%%-------------------------------------------------------------------------
+cookie_profile() ->
+    [{doc, "Test cookies on a non default profile."}].
+cookie_profile(Config) when is_list(Config) ->   
+    inets:start(httpc, [{profile, cookie_test}]),
+    ok = httpc:set_options([{cookies, enabled}], cookie_test),
+
+    Request0 = {url(group_name(Config), "/cookie.html", Config), []},
+
+    {ok, {{_,200,_}, [_ | _], [_|_]}}
+	= httpc:request(get, Request0, [], [], cookie_test),
+
+    %% Populate table to be used by the "dummy" server
+    ets:new(cookie, [named_table, public, set]),
+    ets:insert(cookie, {cookies, true}),
+
+    Request1 = {url(group_name(Config), "/", Config), []},
+
+    {ok, {{_,200,_}, [_ | _], [_|_]}}
+	= httpc:request(get, Request1, [], [], cookie_test),
+
+    ets:delete(cookie),
+    inets:stop(httpc, cookie_test).
+
 %%-------------------------------------------------------------------------
 headers_as_is(doc) ->
     ["Test the option headers_as_is"];
@@ -795,6 +825,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).