From c9f480b49256e1f7869265e4346c594fa4f90fd5 Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Fri, 19 Mar 2010 14:48:15 +0000
Subject: OTP-8508 & OTP-8509.

---
 lib/inets/src/http_client/httpc_handler.erl | 35 +++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 9 deletions(-)

(limited to 'lib/inets/src/http_client/httpc_handler.erl')

diff --git a/lib/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl
index 31585537d4..695ff9cf82 100644
--- a/lib/inets/src/http_client/httpc_handler.erl
+++ b/lib/inets/src/http_client/httpc_handler.erl
@@ -280,7 +280,7 @@ handle_call({connect_and_send, #request{address = Address0,
 		{ok, NewState} ->
 		    {reply, ok, NewState};
 		{stop, Error, NewState} ->
-		    {stop, Error, Error, NewState}
+		    {stop, normal, Error, NewState}
 	    end
     end;
 	
@@ -675,6 +675,24 @@ handle_info({'EXIT', _, _}, State) ->
 %%--------------------------------------------------------------------
 
 %% Init error there is no socket to be closed.
+terminate(normal, 
+	  #state{request = Request, 
+		 session = {send_failed, AReason} = Reason} = State) ->
+    ?hcrd("terminate", [{send_reason, AReason}, {request, Request}]),
+    maybe_send_answer(Request, 
+		      httpc_response:error(Request, Reason), 
+		      State),
+    ok; 
+
+terminate(normal, 
+	  #state{request = Request, 
+		 session = {connect_failed, AReason} = Reason} = State) ->
+    ?hcrd("terminate", [{connect_reason, AReason}, {request, Request}]),
+    maybe_send_answer(Request, 
+		      httpc_response:error(Request, Reason), 
+		      State),
+    ok; 
+
 terminate(normal, #state{session = undefined}) ->
     ok;  
 
@@ -886,18 +904,17 @@ connect_and_send_first_request(Address,
 		    NewState = activate_request_timeout(TmpState),
 		    {ok, NewState};
 
-		{error, Reason} -> 
+		{error, Reason} = Error -> 
 		    ?hcrv("failed sending request", [{reason, Reason}]),
-		    Error = {error, {send_failed, 
-				     httpc_response:error(Request, Reason)}},
-		    {stop, Error, State#state{request = Request}}
+		    {stop, Error, 
+		     State#state{session = {send_failed, Reason}, 
+				 request = Request}}
 	    end;
 
-	{error, Reason} -> 
+	{error, Reason} = Error -> 
 	    ?hcri("connect failed", [{reason, Reason}]),
-	    Error = {error, {connect_failed, 
-			     httpc_response:error(Request, Reason)}},
-	    {stop, Error, State#state{request = Request}}
+	    {stop, Error, State#state{session = {connect_failed, Reason},
+				       request = Request}}
     end.
 
 
-- 
cgit v1.2.3