aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2020-07-03 11:02:59 +0200
committerLoïc Hoguin <[email protected]>2020-07-03 11:02:59 +0200
commit03d306e6d172eb272a564aa8626d4554d1046455 (patch)
tree35d3f8f9bd585e3e46aa55810019a8314a6a8b62 /src
parent5aac00d60c7f22d717375e45a69769f53ad9555c (diff)
downloadcowboy-03d306e6d172eb272a564aa8626d4554d1046455.tar.gz
cowboy-03d306e6d172eb272a564aa8626d4554d1046455.tar.bz2
cowboy-03d306e6d172eb272a564aa8626d4554d1046455.zip
Fix concurrent body streaming getting stuck with HTTP/2
Diffstat (limited to 'src')
-rw-r--r--src/cowboy_stream_h.erl8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/cowboy_stream_h.erl b/src/cowboy_stream_h.erl
index 9f42acc..a4a1c1a 100644
--- a/src/cowboy_stream_h.erl
+++ b/src/cowboy_stream_h.erl
@@ -235,9 +235,13 @@ info(StreamID, Data0={data, Pid, _, _}, State0=#state{stream_body_status=Status}
end,
Data = erlang:delete_element(2, Data0),
do_info(StreamID, Data, [Data], State);
-info(StreamID, Alarm={alarm, Name, on}, State)
+info(StreamID, Alarm={alarm, Name, on}, State0=#state{stream_body_status=Status})
when Name =:= connection_buffer_full; Name =:= stream_buffer_full ->
- do_info(StreamID, Alarm, [], State#state{stream_body_status=blocking});
+ State = case Status of
+ normal -> State0#state{stream_body_status=blocking};
+ _ -> State0
+ end,
+ do_info(StreamID, Alarm, [], State);
info(StreamID, Alarm={alarm, Name, off}, State=#state{stream_body_pid=Pid, stream_body_status=Status})
when Name =:= connection_buffer_full; Name =:= stream_buffer_full ->
_ = case Status of