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

Don't send chunked bodies when the method is HEAD

Browse source
This commit is contained in:
Loïc Hoguin 2017-11-29 22:09:33 +01:00
parent b0519af42a
commit a66eb5cd6e
No known key found for this signature in database
GPG key ID: 8A9DF795F6FED764
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/cowboy_http.erl
View file

@ -67,6 +67,8 @@
id = undefined :: cowboy_stream:streamid(), id = undefined :: cowboy_stream:streamid(),
%% Stream handlers and their state. %% Stream handlers and their state.
state = undefined :: {module(), any()}, state = undefined :: {module(), any()},
%% Request method.
method = undefined :: binary(),
%% Client HTTP version for this stream. %% Client HTTP version for this stream.
version = undefined :: cowboy:http_version(), version = undefined :: cowboy:http_version(),
%% Unparsed te header. Used to know if we can send trailers. %% Unparsed te header. Used to know if we can send trailers.
@ -265,13 +267,14 @@ parse(Buffer, State=#state{in_state=#ps_body{}}) ->
after_parse(parse_body(Buffer, State)). after_parse(parse_body(Buffer, State)).
%% @todo Don't parse if body is finished but request isn't. Let's not parallelize for now. %% @todo Don't parse if body is finished but request isn't. Let's not parallelize for now.
after_parse({request, Req=#{streamid := StreamID, headers := Headers, version := Version}, after_parse({request, Req=#{streamid := StreamID, method := Method,
headers := Headers, version := Version},
State0=#state{opts=Opts, streams=Streams0}, Buffer}) -> State0=#state{opts=Opts, streams=Streams0}, Buffer}) ->
try cowboy_stream:init(StreamID, Req, Opts) of try cowboy_stream:init(StreamID, Req, Opts) of
{Commands, StreamState} -> {Commands, StreamState} ->
TE = maps:get(<<"te">>, Headers, undefined), TE = maps:get(<<"te">>, Headers, undefined),
Streams = [#stream{id=StreamID, state=StreamState, Streams = [#stream{id=StreamID, state=StreamState,
version=Version, te=TE}|Streams0], method=Method, version=Version, te=TE}|Streams0],
State1 = case maybe_req_close(State0, Headers, Version) of State1 = case maybe_req_close(State0, Headers, Version) of
close -> State0#state{streams=Streams, last_streamid=StreamID}; close -> State0#state{streams=Streams, last_streamid=StreamID};
keepalive -> State0#state{streams=Streams} keepalive -> State0#state{streams=Streams}
@ -900,6 +903,8 @@ commands(State0=#state{socket=Socket, transport=Transport, streams=Streams}, Str
0 -> 0 ->
%% We send the last chunk only if version is HTTP/1.1 and IsFin=fin. %% We send the last chunk only if version is HTTP/1.1 and IsFin=fin.
case lists:keyfind(StreamID, #stream.id, Streams) of case lists:keyfind(StreamID, #stream.id, Streams) of
#stream{method= <<"HEAD">>} ->
ok;
#stream{version='HTTP/1.1'} when IsFin =:= fin -> #stream{version='HTTP/1.1'} when IsFin =:= fin ->
Transport:send(Socket, <<"0\r\n\r\n">>); Transport:send(Socket, <<"0\r\n\r\n">>);
_ -> _ ->
@ -909,6 +914,8 @@ commands(State0=#state{socket=Socket, transport=Transport, streams=Streams}, Str
%% @todo We need to kill the stream if it tries to send data before headers. %% @todo We need to kill the stream if it tries to send data before headers.
%% @todo Same as above. %% @todo Same as above.
case lists:keyfind(StreamID, #stream.id, Streams) of case lists:keyfind(StreamID, #stream.id, Streams) of
#stream{method= <<"HEAD">>} ->
ok;
#stream{version='HTTP/1.1'} -> #stream{version='HTTP/1.1'} ->
Transport:send(Socket, [ Transport:send(Socket, [
integer_to_binary(Size, 16), <<"\r\n">>, Data, integer_to_binary(Size, 16), <<"\r\n">>, Data,