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

Do not process HTTP/1.1 requests coming in after the last

Browse source
This commit is contained in:
Loïc Hoguin 2018-05-18 17:10:29 +02:00
parent 07d454bdb7
commit 763eef4e46
No known key found for this signature in database
GPG key ID: 8A9DF795F6FED764
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/cowboy_http.erl
View file

@ -169,10 +169,15 @@ before_loop(State=#state{socket=Socket, transport=Transport}, Buffer) ->
loop(State, Buffer). loop(State, Buffer).
loop(State=#state{parent=Parent, socket=Socket, transport=Transport, opts=Opts, loop(State=#state{parent=Parent, socket=Socket, transport=Transport, opts=Opts,
timer=TimerRef, children=Children, streams=Streams}, Buffer) -> timer=TimerRef, children=Children, in_streamid=InStreamID,
last_streamid=LastStreamID, streams=Streams}, Buffer) ->
{OK, Closed, Error} = Transport:messages(), {OK, Closed, Error} = Transport:messages(),
InactivityTimeout = maps:get(inactivity_timeout, Opts, 300000), InactivityTimeout = maps:get(inactivity_timeout, Opts, 300000),
receive receive
%% Discard data coming in after the last request
%% we want to process was received fully.
{OK, Socket, _} when InStreamID > LastStreamID ->
before_loop(State, Buffer);
%% Socket messages. %% Socket messages.
{OK, Socket, Data} -> {OK, Socket, Data} ->
%% Only reset the timeout if it is idle_timeout (active streams). %% Only reset the timeout if it is idle_timeout (active streams).
@ -249,9 +254,13 @@ timeout(State, idle_timeout) ->
terminate(State, {connection_error, timeout, terminate(State, {connection_error, timeout,
'Connection idle longer than configuration allows.'}). 'Connection idle longer than configuration allows.'}).
%% Request-line.
parse(<<>>, State) -> parse(<<>>, State) ->
before_loop(State, <<>>); before_loop(State, <<>>);
%% Do not process requests that come in after the last request
%% and discard the buffer if any to save memory.
parse(_, State=#state{in_streamid=InStreamID, in_state=#ps_request_line{},
last_streamid=LastStreamID}) when InStreamID > LastStreamID ->
before_loop(State, <<>>);
parse(Buffer, State=#state{in_state=#ps_request_line{empty_lines=EmptyLines}}) -> parse(Buffer, State=#state{in_state=#ps_request_line{empty_lines=EmptyLines}}) ->
after_parse(parse_request(Buffer, State, EmptyLines)); after_parse(parse_request(Buffer, State, EmptyLines));
parse(Buffer, State=#state{in_state=PS=#ps_header{headers=Headers, name=undefined}}) -> parse(Buffer, State=#state{in_state=PS=#ps_header{headers=Headers, name=undefined}}) ->
@ -267,7 +276,6 @@ parse(Buffer, State=#state{in_state=#ps_body{}}) ->
%% We may want to get bodies that are below a threshold without waiting, and buffer them %% We may want to get bodies that are below a threshold without waiting, and buffer them
%% until the request asks, though. %% until the request asks, though.
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.
after_parse({request, Req=#{streamid := StreamID, method := Method, after_parse({request, Req=#{streamid := StreamID, method := Method,
headers := Headers, version := Version}, headers := Headers, version := Version},