inets: Correct guard test

Guard test for error case was not updated to handle httpc stream concept
properly.

2 files changed, 23 insertions, 3 deletions

diff --git a/lib/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl
index bd1d2e833a..6907bf5262 100644
--- a/lib/inets/src/http_client/httpc_handler.erl
+++ b/lib/inets/src/http_client/httpc_handler.erl
@@ -736,7 +736,7 @@ maybe_send_answer(Request, Answer, State) ->
     answer_request(Request, Answer, State).
 
 deliver_answer(#request{from = From} = Request) 
-  when is_pid(From) ->
+  when From =/= answer_sent ->
     Response = httpc_response:error(Request, socket_closed_remotely),
     httpc_response:send(From, Response);
 deliver_answer(_Request) ->
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index 5dfb1474e5..a39e786c79 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -130,7 +130,8 @@ only_simulated() ->
      port_in_host_header,
      redirect_port_in_host_header,
      relaxed,
-     multipart_chunks
+     multipart_chunks,
+     stream_fun_server_close
     ].
 
 misc() ->
@@ -745,7 +746,7 @@ empty_body() ->
 empty_body(Config) when is_list(Config) ->
     URL = url(group_name(Config), "/empty.html", Config),
     {ok, {{_,200,_}, [_ | _], []}} =
-	httpc:request(get, {URL, []}, [{timeout, 500}], []).
+	httpc:request(get, {URL, []}, [], []).
 
 %%-------------------------------------------------------------------------
 
@@ -1178,6 +1179,22 @@ wait_for_whole_response(Config) when is_list(Config) ->
      ReqSeqNumServer ! shutdown.
 
 %%--------------------------------------------------------------------
+stream_fun_server_close() ->
+    [{doc, "Test that an error msg is received when using a receiver fun as stream target"}].
+stream_fun_server_close(Config) when is_list(Config) ->
+    Request  = {url(group_name(Config), "/delay_close.html", Config), []},
+    Self = self(),
+    Fun = fun(X) -> Self ! X end,
+    {ok, RequestId} = httpc:request(get, Request, [], [{sync, false}, {receiver, Fun}]),
+    receive
+        {RequestId, {error, Reason}} ->
+            ct:pal("Close ~p", [Reason]),
+            ok
+    after 13000 ->
+            ct:fail(did_not_receive_close)
+    end. 
+                                             
+%%--------------------------------------------------------------------
 %% Internal Functions ------------------------------------------------
 %%--------------------------------------------------------------------
 stream(ReceiverPid, Receiver, Config) ->
@@ -2029,6 +2046,9 @@ handle_uri(_,"/multipart_chunks.html",_,_,Socket,_) ->
     send(Socket, Head),
     send_multipart_chunks(Socket),
     http_chunk:encode_last();
+handle_uri(_,"/delay_close.html",_,_,Socket,_) ->
+    ct:sleep(10000),
+    close(Socket);
 handle_uri("HEAD",_,_,_,_,_) ->
     "HTTP/1.1 200 ok\r\n" ++
 	"Content-Length:0\r\n\r\n";