From 2558ba65ad3e39dd10ab65196af8f4dbb067f476 Mon Sep 17 00:00:00 2001 From: Dmitri Vereshchagin Date: Thu, 6 Oct 2022 00:24:43 +0300 Subject: Fix shutdown for HTTP/1.1 pipeline Sending extra response prevented by terminating all streams except the one currently executing. LH: Reworded some variables to make what happens more obvious. --- src/cowboy_http.erl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/cowboy_http.erl') diff --git a/src/cowboy_http.erl b/src/cowboy_http.erl index 8dd2870..abaab06 100644 --- a/src/cowboy_http.erl +++ b/src/cowboy_http.erl @@ -1472,10 +1472,12 @@ early_error(StatusCode0, State=#state{socket=Socket, transport=Transport, initiate_closing(State=#state{streams=[]}, Reason) -> terminate(State, Reason); -initiate_closing(State=#state{streams=[_Stream|Streams], +initiate_closing(State=#state{streams=Streams, out_streamid=OutStreamID}, Reason) -> - terminate_all_streams(State, Streams, Reason), - State#state{last_streamid=OutStreamID}. + {value, LastStream, TerminatedStreams} + = lists:keytake(OutStreamID, #stream.id, Streams), + terminate_all_streams(State, TerminatedStreams, Reason), + State#state{streams=[LastStream], last_streamid=OutStreamID}. %% Function replicated in cowboy_http2. maybe_socket_error(State, {error, closed}) -> -- cgit v1.2.3