From ec8e9a96bd0d0148df5008b0665da0725e5b3f92 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Tue, 4 Mar 2014 12:21:14 +0100
Subject: inets: Reverted commmit f97cd6965ac35d1cbe510de23592956857d144c8

The reverted commit took a too optimistic approch to pipeling. When added
we thought it would be an improvment, but it proved to be a
misconception.
---
 lib/inets/src/http_client/httpc_handler.erl | 44 +++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 11 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 a89a457a51..0957eb3261 100644
--- a/lib/inets/src/http_client/httpc_handler.erl
+++ b/lib/inets/src/http_client/httpc_handler.erl
@@ -1154,7 +1154,7 @@ handle_http_body(Body, #state{headers       = Headers,
 
 handle_response(#state{status = new} = State) ->
     ?hcrd("handle response - status = new", []),
-    handle_response(check_persistent(State));
+    handle_response(try_to_enable_pipeline_or_keep_alive(State));
 
 handle_response(#state{request      = Request,
 		       status       = Status,
@@ -1429,22 +1429,39 @@ is_keep_alive_enabled_server(_,_) ->
 is_keep_alive_connection(Headers, #session{client_close = ClientClose}) ->
     (not ((ClientClose) orelse httpc_response:is_server_closing(Headers))).
 
-check_persistent(
-  #state{session      = #session{type = Type} = Session, 
+try_to_enable_pipeline_or_keep_alive(
+  #state{session      = Session, 
+	 request      = #request{method = Method},
 	 status_line  = {Version, _, _},
 	 headers      = Headers,
-	 profile_name = ProfileName} = State) ->    
+	 profile_name = ProfileName} = State) ->
+    ?hcrd("try to enable pipeline or keep-alive", 
+	  [{version, Version}, 
+	   {headers, Headers}, 
+	   {session, Session}]),
     case is_keep_alive_enabled_server(Version, Headers) andalso 
-	is_keep_alive_connection(Headers, Session) of
+	  is_keep_alive_connection(Headers, Session) of
 	true ->
-	    mark_persistent(ProfileName, Session),
-	    State#state{status = Type};
+	    case (is_pipeline_enabled_client(Session) andalso 
+		  httpc_request:is_idempotent(Method)) of
+		true ->
+		    insert_session(Session, ProfileName),
+		    State#state{status = pipeline};
+		false ->
+		    insert_session(Session, ProfileName),
+		    %% Make sure type is keep_alive in session
+		    %% as it in this case might be pipeline
+		    NewSession = Session#session{type = keep_alive}, 
+		    State#state{status  = keep_alive,
+				session = NewSession}
+	    end;
 	false ->
 	    State#state{status = close}
     end.
 
 answer_request(#request{id = RequestId, from = From} = Request, Msg, 
-	       #state{timers       = Timers, 
+	       #state{session      = Session, 
+		      timers       = Timers, 
 		      profile_name = ProfileName} = State) -> 
     ?hcrt("answer request", [{request, Request}, {msg, Msg}]),
     httpc_response:send(From, Msg),
@@ -1454,14 +1471,19 @@ answer_request(#request{id = RequestId, from = From} = Request, Msg,
     Timer = {RequestId, TimerRef},
     cancel_timer(TimerRef, {timeout, Request#request.id}),
     httpc_manager:request_done(RequestId, ProfileName),
+    NewSession = maybe_make_session_available(ProfileName, Session), 
     Timers2 = Timers#timers{request_timers = lists:delete(Timer, 
 							  RequestTimers)}, 
     State#state{request = Request#request{from = answer_sent},
+		session = NewSession, 
 		timers  = Timers2}.
 
-mark_persistent(ProfileName, Session) ->
-    update_session(ProfileName, Session, #session.persistent, true),
-    Session#session{persistent = true}.
+maybe_make_session_available(ProfileName, 
+			     #session{available = false} = Session) ->
+    update_session(ProfileName, Session, #session.available, true),
+    Session#session{available = true};
+maybe_make_session_available(_ProfileName, Session) ->
+    Session.
     
 cancel_timers(#timers{request_timers = ReqTmrs, queue_timer = QTmr}) ->
     cancel_timer(QTmr, timeout_queue),
-- 
cgit v1.2.3