umgeher/cowboy
0
Fork 0
mirror of https://github.com/ninenines/cowboy.git synced 2025-07-15 12:40:25 +00:00
Code Issues Wiki Activity

Merge branch 'fix-ws-atom-responses' of git://github.com/seriyps/cowboy

Browse source
This commit is contained in:
Loïc Hoguin 2013-08-27 18:21:03 +02:00
commit 0d5a12c3ec
1 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/cowboy_websocket.erl
View file

@ -602,8 +602,8 @@ handler_call(State=#state{handler=Handler}, Req, HandlerState,
NextState(State#state{hibernate=true}, NextState(State#state{hibernate=true},
Req2, HandlerState2, RemainingData); Req2, HandlerState2, RemainingData);
{reply, Payload, Req2, HandlerState2} {reply, Payload, Req2, HandlerState2}
when is_tuple(Payload) -> when is_list(Payload) ->
case websocket_send(Payload, State) of case websocket_send_many(Payload, State) of
{ok, State2} -> {ok, State2} ->
NextState(State2, Req2, HandlerState2, RemainingData); NextState(State2, Req2, HandlerState2, RemainingData);
{shutdown, State2} -> {shutdown, State2} ->
@ -613,8 +613,8 @@ handler_call(State=#state{handler=Handler}, Req, HandlerState,
handler_terminate(State2, Req2, HandlerState2, Error) handler_terminate(State2, Req2, HandlerState2, Error)
end; end;
{reply, Payload, Req2, HandlerState2, hibernate} {reply, Payload, Req2, HandlerState2, hibernate}
when is_tuple(Payload) -> when is_list(Payload) ->
case websocket_send(Payload, State) of case websocket_send_many(Payload, State) of
{ok, State2} -> {ok, State2} ->
NextState(State2#state{hibernate=true}, NextState(State2#state{hibernate=true},
Req2, HandlerState2, RemainingData); Req2, HandlerState2, RemainingData);
@ -624,9 +624,8 @@ handler_call(State=#state{handler=Handler}, Req, HandlerState,
{{error, _} = Error, State2} -> {{error, _} = Error, State2} ->
handler_terminate(State2, Req2, HandlerState2, Error) handler_terminate(State2, Req2, HandlerState2, Error)
end; end;
{reply, Payload, Req2, HandlerState2} {reply, Payload, Req2, HandlerState2} ->
when is_list(Payload) -> case websocket_send(Payload, State) of
case websocket_send_many(Payload, State) of
{ok, State2} -> {ok, State2} ->
NextState(State2, Req2, HandlerState2, RemainingData); NextState(State2, Req2, HandlerState2, RemainingData);
{shutdown, State2} -> {shutdown, State2} ->
@ -635,9 +634,8 @@ handler_call(State=#state{handler=Handler}, Req, HandlerState,
{{error, _} = Error, State2} -> {{error, _} = Error, State2} ->
handler_terminate(State2, Req2, HandlerState2, Error) handler_terminate(State2, Req2, HandlerState2, Error)
end; end;
{reply, Payload, Req2, HandlerState2, hibernate} {reply, Payload, Req2, HandlerState2, hibernate} ->
when is_list(Payload) -> case websocket_send(Payload, State) of
case websocket_send_many(Payload, State) of
{ok, State2} -> {ok, State2} ->
NextState(State2#state{hibernate=true}, NextState(State2#state{hibernate=true},
Req2, HandlerState2, RemainingData); Req2, HandlerState2, RemainingData);