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

src/cowboy_websocket.erl

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