From c09b10190baaae37f4de8bc1732d79acca62b53d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Mon, 25 Sep 2017 12:34:44 +0200 Subject: Move body length count to cowboy_stream_h instead of protocols The documentation was correct, the code was not. This should make it easier to implement new protocols. Note that for HTTP/2 we will need to add some form of counting later on to check for malformed requests, but we can do simpler and just reduce from the expected length and then check if that's 0 when IsFin=fin. --- src/cowboy_http.erl | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/cowboy_http.erl') diff --git a/src/cowboy_http.erl b/src/cowboy_http.erl index 107fd60..f0f8ed7 100644 --- a/src/cowboy_http.erl +++ b/src/cowboy_http.erl @@ -709,11 +709,13 @@ parse_body(Buffer, State=#state{in_streamid=StreamID, in_state= %% @todo Asks for 0 or more bytes. {data, StreamID, nofin, Data, State#state{in_state= PS#ps_body{transfer_decode_state=TState}}, Rest}; - {done, TotalLength, Rest} -> - {data, StreamID, {fin, TotalLength}, <<>>, set_timeout( + %% @todo We probably want to confirm that the total length + %% is the same as the content-length, if one was provided. + {done, _TotalLength, Rest} -> + {data, StreamID, fin, <<>>, set_timeout( State#state{in_streamid=StreamID + 1, in_state=#ps_request_line{}}), Rest}; - {done, Data, TotalLength, Rest} -> - {data, StreamID, {fin, TotalLength}, Data, set_timeout( + {done, Data, _TotalLength, Rest} -> + {data, StreamID, fin, Data, set_timeout( State#state{in_streamid=StreamID + 1, in_state=#ps_request_line{}}), Rest} end. -- cgit v1.2.3