Merge branch 'maint'

* maint:
  inets: Prepare for release
  inets: Fix httpc crash on keep-alive connections

Change-Id: If066f788c3fcb8b5c5a943892d3c03c201590e40

1 files changed, 40 insertions, 2 deletions

diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index 0533b9ab70..4bb449408f 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -50,6 +50,7 @@ all() ->
     [
      {group, http},
      {group, sim_http},
+     {group, http_internal},
      {group, https},
      {group, sim_https},
      {group, misc}
@@ -62,6 +63,7 @@ groups() ->
      %% and it shall be the last test case in the suite otherwise cookie
      %% will fail.
      {sim_http, [], only_simulated() ++ [process_leak_on_keepalive]},
+     {http_internal, [], real_requests_esi()},
      {https, [], real_requests()},
      {sim_https, [], only_simulated()},
      {misc, [], misc()}
@@ -97,6 +99,9 @@ real_requests()->
      invalid_body
     ].
 
+real_requests_esi() ->
+    [slow_connection].
+
 only_simulated() ->
     [
      cookie,
@@ -1245,7 +1250,25 @@ stream_fun_server_close(Config) when is_list(Config) ->
     after 13000 ->
             ct:fail(did_not_receive_close)
     end. 
-                                             
+
+%%--------------------------------------------------------------------
+slow_connection() ->
+    [{doc, "Test that a request on a slow keep-alive connection won't crash the httpc_manager"}].
+slow_connection(Config) when is_list(Config) ->
+    BodyFun = fun(0) -> eof;
+                 (LenLeft) -> timer:sleep(1000),
+                              {ok, lists:duplicate(10, "1"), LenLeft - 10}
+              end,
+    Request  = {url(group_name(Config), "/httpc_SUITE:esi_post", Config),
+                [{"content-length", "100"}],
+                "text/plain",
+                {BodyFun, 100}},
+    {ok, _} = httpc:request(post, Request, [], []),
+    %% Second request causes a crash if gen_server timeout is not set to infinity
+    %% in httpc_handler.
+    {ok, _} = httpc:request(post, Request, [], []).
+
+
 %%--------------------------------------------------------------------
 %% Internal Functions ------------------------------------------------
 %%--------------------------------------------------------------------
@@ -1339,6 +1362,8 @@ url(https, End, Config) ->
     ?TLS_URL_START ++ Host ++ ":" ++ integer_to_list(Port) ++ End;
 url(sim_http, End, Config) ->
     url(http, End, Config);
+url(http_internal, End, Config) ->
+    url(http, End, Config);
 url(sim_https, End, Config) ->
     url(https, End, Config).
 url(http, UserInfo, End, Config) ->
@@ -1385,7 +1410,17 @@ server_config(http, Config) ->
      {mime_type, "text/plain"},
      {script_alias, {"/cgi-bin/", filename:join(ServerRoot, "cgi-bin") ++ "/"}}
     ];
-
+server_config(http_internal, Config) ->
+    ServerRoot = proplists:get_value(server_root, Config),
+    [{port, 0},
+     {server_name,"httpc_test"},
+     {server_root, ServerRoot},
+     {document_root, proplists:get_value(doc_root, Config)},
+     {bind_address, any},
+     {ipfamily, inet_version()},
+     {mime_type, "text/plain"},
+     {erl_script_alias, {"", [httpc_SUITE]}}
+    ];
 server_config(https, Config) ->
     [{socket_type, {essl, ssl_config(Config)}} | server_config(http, Config)];
 server_config(sim_https, Config) ->
@@ -1393,6 +1428,9 @@ server_config(sim_https, Config) ->
 server_config(_, _) ->
     [].
 
+esi_post(Sid, _Env, _Input) ->
+    mod_esi:deliver(Sid, ["OK"]).
+
 start_apps(https) ->
     inets_test_lib:start_apps([crypto, public_key, ssl]);
 start_apps(sim_https) ->