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

Make the default 204 response go through stream handlers

Browse source
This commit is contained in:
Loïc Hoguin 2017-04-18 16:07:01 +02:00
parent 6e8b907ae2
commit 061cc227b1
No known key found for this signature in database
GPG key ID: 71366FF21851DF03
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/cowboy_http.erl
View file

@ -913,19 +913,19 @@ stream_reset(State, StreamID, StreamError={internal_error, _, _}) ->
% stream_terminate(State#state{out_state=done}, StreamID, StreamError). % stream_terminate(State#state{out_state=done}, StreamID, StreamError).
stream_terminate(State, StreamID, StreamError). stream_terminate(State, StreamID, StreamError).
stream_terminate(State=#state{socket=Socket, transport=Transport, stream_terminate(State0=#state{socket=Socket, transport=Transport,
out_streamid=OutStreamID, out_state=OutState, out_streamid=OutStreamID, out_state=OutState,
streams=Streams0, children=Children0}, StreamID, Reason) -> streams=Streams0, children=Children0}, StreamID, Reason) ->
{value, #stream{state=StreamState, version=Version}, Streams} {value, #stream{state=StreamState, version=Version}, Streams}
= lists:keytake(StreamID, #stream.id, Streams0), = lists:keytake(StreamID, #stream.id, Streams0),
_ = case OutState of State = case OutState of
wait -> wait ->
%% @todo This should probably go through the stream handler info callback. info(State0, StreamID, {response, 204, #{}, <<>>});
Transport:send(Socket, cow_http:response(204, 'HTTP/1.1', []));
chunked when Version =:= 'HTTP/1.1' -> chunked when Version =:= 'HTTP/1.1' ->
Transport:send(Socket, <<"0\r\n\r\n">>); _ = Transport:send(Socket, <<"0\r\n\r\n">>),
State0;
_ -> %% done or Version =:= 'HTTP/1.0' _ -> %% done or Version =:= 'HTTP/1.0'
ok State0
end, end,
stream_call_terminate(StreamID, Reason, StreamState), stream_call_terminate(StreamID, Reason, StreamState),

12
src/cowboy_http2.erl
View file

@ -655,20 +655,22 @@ stream_reset(State=#state{socket=Socket, transport=Transport}, StreamID,
stream_terminate(State, StreamID, StreamError). stream_terminate(State, StreamID, StreamError).
stream_terminate(State=#state{socket=Socket, transport=Transport, stream_terminate(State=#state{socket=Socket, transport=Transport,
streams=Streams0, children=Children0, encode_state=EncodeState0}, StreamID, Reason) -> streams=Streams0, children=Children0}, StreamID, Reason) ->
case lists:keytake(StreamID, #stream.id, Streams0) of case lists:keytake(StreamID, #stream.id, Streams0) of
%% When the stream terminates normally (without sending RST_STREAM)
%% and no response was sent, we need to send a proper response back to the client.
{value, #stream{state=StreamState, local=idle}, Streams} when Reason =:= normal -> {value, #stream{state=StreamState, local=idle}, Streams} when Reason =:= normal ->
Headers = #{<<":status">> => <<"204">>}, State1 = info(State, StreamID, {response, 204, #{}, <<>>}),
{HeaderBlock, EncodeState} = headers_encode(Headers, EncodeState0),
Transport:send(Socket, cow_http2:headers(StreamID, fin, HeaderBlock)),
stream_call_terminate(StreamID, Reason, StreamState), stream_call_terminate(StreamID, Reason, StreamState),
Children = stream_terminate_children(Children0, StreamID, []), Children = stream_terminate_children(Children0, StreamID, []),
State#state{streams=Streams, children=Children, encode_state=EncodeState}; State1#state{streams=Streams, children=Children};
%% When a response was sent but not terminated, we need to close the stream.
{value, #stream{state=StreamState, local=nofin}, Streams} when Reason =:= normal -> {value, #stream{state=StreamState, local=nofin}, Streams} when Reason =:= normal ->
Transport:send(Socket, cow_http2:data(StreamID, fin, <<>>)), Transport:send(Socket, cow_http2:data(StreamID, fin, <<>>)),
stream_call_terminate(StreamID, Reason, StreamState), stream_call_terminate(StreamID, Reason, StreamState),
Children = stream_terminate_children(Children0, StreamID, []), Children = stream_terminate_children(Children0, StreamID, []),
State#state{streams=Streams, children=Children}; State#state{streams=Streams, children=Children};
%% Otherwise we sent an RST_STREAM and the stream is already closed.
{value, #stream{state=StreamState}, Streams} -> {value, #stream{state=StreamState}, Streams} ->
stream_call_terminate(StreamID, Reason, StreamState), stream_call_terminate(StreamID, Reason, StreamState),
Children = stream_terminate_children(Children0, StreamID, []), Children = stream_terminate_children(Children0, StreamID, []),