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

Remove duplicate code for ensure_response

Browse source
This commit is contained in:
Loïc Hoguin 2012-09-15 22:19:39 +02:00
parent 27d591180c
commit 0aaa717575
3 changed files with 27 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/cowboy_websocket.erl
View file

@ -126,7 +126,8 @@ handler_init(State=#state{transport=Transport, handler=Handler, opts=Opts},
websocket_handshake(State#state{timeout=Timeout,
hibernate=true}, Req2, HandlerState);
{shutdown, Req2} ->
upgrade_denied(Req2)
cowboy_req:ensure_response(Req2, 400),
closed
catch Class:Reason ->
upgrade_error(Req),
PLReq = cowboy_req:to_list(Req),
@ -146,20 +147,6 @@ upgrade_error(Req) ->
closed
end.
%% @see cowboy_protocol:ensure_response/1
-spec upgrade_denied(cowboy_req:req()) -> closed.
upgrade_denied(#http_req{resp_state=done}) ->
closed;
upgrade_denied(Req=#http_req{resp_state=waiting}) ->
{ok, _Req2} = cowboy_req:reply(400, [], [], Req),
closed;
upgrade_denied(#http_req{method='HEAD', resp_state=chunks}) ->
closed;
upgrade_denied(#http_req{socket=Socket, transport=Transport,
resp_state=chunks}) ->
Transport:send(Socket, <<"0\r\n\r\n">>),
closed.
-spec websocket_handshake(#state{}, cowboy_req:req(), any()) -> closed.
websocket_handshake(State=#state{socket=Socket, transport=Transport,
version=0, origin=Origin, challenge={Key1, Key2}},