From 65ed13d2da2e6bab65fcde7db2e46060c33be71f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Sat, 9 Feb 2013 21:46:05 +0100 Subject: Do not reset the connection timeout timer on send Sends can be successful even if the connection is gone. --- src/cowboy_websocket.erl | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/cowboy_websocket.erl') diff --git a/src/cowboy_websocket.erl b/src/cowboy_websocket.erl index debb69f..1a87732 100644 --- a/src/cowboy_websocket.erl +++ b/src/cowboy_websocket.erl @@ -534,8 +534,7 @@ handler_call(State=#state{handler=Handler, handler_opts=HandlerOpts}, Req, when is_tuple(Payload) -> case websocket_send(Payload, State) of ok -> - State2 = handler_loop_timeout(State), - NextState(State2, Req2, HandlerState2, RemainingData); + NextState(State, Req2, HandlerState2, RemainingData); shutdown -> handler_terminate(State, Req2, HandlerState, {normal, shutdown}); @@ -546,8 +545,7 @@ handler_call(State=#state{handler=Handler, handler_opts=HandlerOpts}, Req, when is_tuple(Payload) -> case websocket_send(Payload, State) of ok -> - State2 = handler_loop_timeout(State), - NextState(State2#state{hibernate=true}, + NextState(State#state{hibernate=true}, Req2, HandlerState2, RemainingData); shutdown -> handler_terminate(State, Req2, HandlerState, @@ -559,8 +557,7 @@ handler_call(State=#state{handler=Handler, handler_opts=HandlerOpts}, Req, when is_list(Payload) -> case websocket_send_many(Payload, State) of ok -> - State2 = handler_loop_timeout(State), - NextState(State2, Req2, HandlerState2, RemainingData); + NextState(State, Req2, HandlerState2, RemainingData); shutdown -> handler_terminate(State, Req2, HandlerState, {normal, shutdown}); @@ -571,8 +568,7 @@ handler_call(State=#state{handler=Handler, handler_opts=HandlerOpts}, Req, when is_list(Payload) -> case websocket_send_many(Payload, State) of ok -> - State2 = handler_loop_timeout(State), - NextState(State2#state{hibernate=true}, + NextState(State#state{hibernate=true}, Req2, HandlerState2, RemainingData); shutdown -> handler_terminate(State, Req2, HandlerState, -- cgit v1.2.3