umgeher/cowboy
0
Fork 0
mirror of https://github.com/ninenines/cowboy.git synced 2025-07-14 20:30:23 +00:00
Code Issues Wiki Activity

Avoid some crashes when HTTP/2 streams flush their response

Browse source
This commit is contained in:
Loïc Hoguin 2017-09-25 12:55:30 +02:00
parent c09b10190b
commit ea80e7a309
No known key found for this signature in database
GPG key ID: 71366FF21851DF03
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/cowboy_http2.erl
View file

@ -291,6 +291,10 @@ frame(State0=#state{remote_window=ConnWindow, streams=Streams},
DataLen = byte_size(Data), DataLen = byte_size(Data),
State = State0#state{remote_window=ConnWindow - DataLen}, State = State0#state{remote_window=ConnWindow - DataLen},
case lists:keyfind(StreamID, #stream.id, Streams) of case lists:keyfind(StreamID, #stream.id, Streams) of
Stream = #stream{state=flush, remote=nofin, remote_window=StreamWindow} ->
%% @todo We need to cancel streams that we don't want to receive
%% the full body from after we finish flushing the response.
after_commands(State, Stream#stream{remote=IsFin, remote_window=StreamWindow - DataLen});
Stream = #stream{state=StreamState0, remote=nofin, remote_window=StreamWindow} -> Stream = #stream{state=StreamState0, remote=nofin, remote_window=StreamWindow} ->
try cowboy_stream:data(StreamID, IsFin, Data, StreamState0) of try cowboy_stream:data(StreamID, IsFin, Data, StreamState0) of
{Commands, StreamState} -> {Commands, StreamState} ->
@ -428,6 +432,9 @@ down(State=#state{children=Children0}, Pid, Msg) ->
info(State=#state{streams=Streams}, StreamID, Msg) -> info(State=#state{streams=Streams}, StreamID, Msg) ->
case lists:keyfind(StreamID, #stream.id, Streams) of case lists:keyfind(StreamID, #stream.id, Streams) of
#stream{state=flush} ->
error_logger:error_msg("Received message ~p for terminated stream ~p.", [Msg, StreamID]),
State;
Stream = #stream{state=StreamState0} -> Stream = #stream{state=StreamState0} ->
try cowboy_stream:info(StreamID, Msg, StreamState0) of try cowboy_stream:info(StreamID, Msg, StreamState0) of
{Commands, StreamState} -> {Commands, StreamState} ->