diff options
author | Ingela Anderton Andin <ingela@erlang.org> | 2023-03-13 12:26:51 +0100 |
---|---|---|
committer | Ingela Anderton Andin <ingela@erlang.org> | 2023-03-16 12:57:18 +0100 |
commit | 952e9109c3ced3972c6d37b9ffd49416de2e8e71 (patch) | |
tree | 044799ce384ad1b8b57d5ae9177892fcb36d7ef1 | |
parent | 68522e556c020de5fe7e20c4c082927a5d04d8e7 (diff) | |
download | erlang-952e9109c3ced3972c6d37b9ffd49416de2e8e71.tar.gz |
inets: httpc - fix pipeline and keepalive queue bug
This is a backport to OTP-24 track of the bugfix made as part of PR-6901
-rw-r--r-- | lib/inets/src/http_client/httpc_handler.erl | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/lib/inets/src/http_client/httpc_handler.erl b/lib/inets/src/http_client/httpc_handler.erl index 615314ac1d..17d9b60757 100644 --- a/lib/inets/src/http_client/httpc_handler.erl +++ b/lib/inets/src/http_client/httpc_handler.erl @@ -322,7 +322,7 @@ terminate(normal, cancel_timers(Timers), %% Maybe deliver answers to requests - deliver_answer(Request), + maybe_deliver_answer(Request, State), %% And, just in case, close our side (**really** overkill) http_transport:close(SocketType, Socket); @@ -713,24 +713,26 @@ call(Msg, Pid) -> cast(Msg, Pid) -> gen_server:cast(Pid, Msg). -maybe_retry_queue(Q, State) -> - case queue:is_empty(Q) of - false -> +maybe_retry_queue(Q, #state{status = new} = State) -> + retry_pipeline(queue:to_list(Q), State); +maybe_retry_queue(Q, #state{request = Request} = State) -> + case Request of + undefined -> retry_pipeline(queue:to_list(Q), State); - true -> - ok + _ -> + retry_pipeline(queue:to_list(queue:cons(Request, Q)), State) end. - + maybe_send_answer(#request{from = answer_sent}, _Reason, State) -> State; maybe_send_answer(Request, Answer, State) -> answer_request(Request, Answer, State). -deliver_answer(#request{from = From} = Request) +maybe_deliver_answer(#request{from = From} = Request, #state{status = new}) when From =/= answer_sent -> Response = httpc_response:error(Request, socket_closed_remotely), httpc_response:send(From, Response); -deliver_answer(_Request) -> +maybe_deliver_answer(_,_) -> ok. %%%-------------------------------------------------------------------- |