Browse Source

Do not reset the connection timeout timer on send

Sends can be successful even if the connection is gone.
Loïc Hoguin 12 years ago
parent
commit
65ed13d2da
1 changed files with 4 additions and 8 deletions
  1. 4 8
      src/cowboy_websocket.erl

+ 4 - 8
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,