From 2aabc73045daa1c06d73c76ffc442ee7ebe38d14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Fri, 12 Apr 2013 14:16:59 +0200 Subject: Ensure we can fetch the body in the info/3 function of loop handlers --- src/cowboy_handler.erl | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/cowboy_handler.erl b/src/cowboy_handler.erl index 7aaf9ae..7d00524 100644 --- a/src/cowboy_handler.erl +++ b/src/cowboy_handler.erl @@ -214,7 +214,18 @@ handler_loop(Req, State=#state{loop_buffer_size=NbBytes, {timeout, OlderTRef, ?MODULE} when is_reference(OlderTRef) -> handler_before_loop(Req, State, Handler, HandlerState); Message -> - handler_call(Req, State, Handler, HandlerState, Message) + %% We set the socket back to {active, false} mode in case + %% the handler is going to call recv. We also flush any + %% data received after that and put it into the buffer. + %% We do not check the size here, if data keeps coming + %% we'll error out on the next packet received. + Transport:setopts(Socket, [{active, false}]), + Req2 = receive {OK, Socket, Data} -> + cowboy_req:append_buffer(Data, Req) + after 0 -> + Req + end, + handler_call(Req2, State, Handler, HandlerState, Message) end. -spec handler_call(Req, #state{}, module(), any(), any()) -- cgit v1.2.3