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

Remove an unnecessary function

Browse source
This commit is contained in:
Loïc Hoguin 2018-10-28 11:42:18 +01:00
parent d4129e6305
commit 266178b6bc
No known key found for this signature in database
GPG key ID: 8A9DF795F6FED764
1 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/cowboy_http2.erl
View file

@ -293,8 +293,8 @@ headers_frame(State=#state{ref=Ref, peer=Peer, sock=Sock, cert=Cert},
Port = ensure_port(Scheme, Port0), Port = ensure_port(Scheme, Port0),
try cow_http:parse_fullpath(PathWithQs) of try cow_http:parse_fullpath(PathWithQs) of
{<<>>, _} -> {<<>>, _} ->
malformed_request(State, StreamID, stream_reset(State, StreamID, {stream_error, protocol_error,
'The path component must not be empty. (RFC7540 8.1.2.3)'); 'The path component must not be empty. (RFC7540 8.1.2.3)'});
{Path, Qs} -> {Path, Qs} ->
Req0 = #{ Req0 = #{
ref => Ref, ref => Ref,
@ -323,12 +323,12 @@ headers_frame(State=#state{ref=Ref, peer=Peer, sock=Sock, cert=Cert},
end, end,
headers_frame(State, StreamID, Req) headers_frame(State, StreamID, Req)
catch _:_ -> catch _:_ ->
malformed_request(State, StreamID, stream_reset(State, StreamID, {stream_error, protocol_error,
'The :path pseudo-header is invalid. (RFC7540 8.1.2.3)') 'The :path pseudo-header is invalid. (RFC7540 8.1.2.3)'})
end end
catch _:_ -> catch _:_ ->
malformed_request(State, StreamID, stream_reset(State, StreamID, {stream_error, protocol_error,
'The :authority pseudo-header is invalid. (RFC7540 8.1.2.3)') 'The :authority pseudo-header is invalid. (RFC7540 8.1.2.3)'})
end. end.
ensure_port(<<"http">>, undefined) -> 80; ensure_port(<<"http">>, undefined) -> 80;
@ -351,13 +351,6 @@ headers_to_map([{Name, Value}|Tail], Acc0) ->
end, end,
headers_to_map(Tail, Acc). headers_to_map(Tail, Acc).
%% @todo Probably not a very useful function, just use stream_reset.
malformed_request(State=#state{socket=Socket, transport=Transport,
http2_machine=HTTP2Machine0}, StreamID, _) ->
Transport:send(Socket, cow_http2:rst_stream(StreamID, protocol_error)),
{ok, HTTP2Machine} = cow_http2_machine:reset_stream(StreamID, HTTP2Machine0),
State#state{http2_machine=HTTP2Machine}.
headers_frame(State=#state{opts=Opts, streams=Streams}, StreamID, Req) -> headers_frame(State=#state{opts=Opts, streams=Streams}, StreamID, Req) ->
try cowboy_stream:init(StreamID, Req, Opts) of try cowboy_stream:init(StreamID, Req, Opts) of
{Commands, StreamState} -> {Commands, StreamState} ->