aboutsummaryrefslogtreecommitdiffstats
path: root/src/cowboy_websocket.erl
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2016-03-06 18:09:43 +0100
committerLoïc Hoguin <[email protected]>2016-03-06 18:09:43 +0100
commit0193538dbafd275f543bfbce1065358ea6554641 (patch)
treea1cc93696152465eebedf03b88b8ea5b7c040c89 /src/cowboy_websocket.erl
parent7bdd710849a35c12afe3f91bc5df4006db4c0282 (diff)
downloadcowboy-0193538dbafd275f543bfbce1065358ea6554641.tar.gz
cowboy-0193538dbafd275f543bfbce1065358ea6554641.tar.bz2
cowboy-0193538dbafd275f543bfbce1065358ea6554641.zip
Fix warnings
Diffstat (limited to 'src/cowboy_websocket.erl')
-rw-r--r--src/cowboy_websocket.erl18
1 files changed, 13 insertions, 5 deletions
diff --git a/src/cowboy_websocket.erl b/src/cowboy_websocket.erl
index 9a2862e..757f52c 100644
--- a/src/cowboy_websocket.erl
+++ b/src/cowboy_websocket.erl
@@ -101,9 +101,13 @@ websocket_upgrade(State, Req) ->
-spec websocket_extensions(#state{}, Req)
-> {ok, #state{}, Req} when Req::cowboy_req:req().
websocket_extensions(State, Req) ->
- %% @todo Proper options for this.
-% [Compress] = cowboy_req:get([resp_compress], Req),
- Compress = false,
+ %% @todo We want different options for this. For example
+ %% * compress everything auto
+ %% * compress only text auto
+ %% * compress only binary auto
+ %% * compress nothing auto (but still enabled it)
+ %% * disable compression
+ Compress = maps:get(websocket_compress, Req, false),
Req2 = Req#{websocket_compress => false},
case {Compress, cowboy_req:parse_header(<<"sec-websocket-extensions">>, Req2)} of
{true, Extensions} when Extensions =/= undefined ->
@@ -144,7 +148,7 @@ websocket_extensions(State, Req, [_|Tail], RespHeader) ->
-spec websocket_handshake(#state{}, Req, any(), Env)
-> {ok, Req, Env}
when Req::cowboy_req:req(), Env::cowboy_middleware:env().
-websocket_handshake(State=#state{transport=Transport, key=Key},
+websocket_handshake(State=#state{key=Key},
Req=#{pid := Pid, streamid := StreamID}, HandlerState, Env) ->
Challenge = base64:encode(crypto:hash(sha,
<< Key/binary, "258EAFA5-E914-47DA-95CA-C5AB0DC85B11" >>)),
@@ -159,7 +163,11 @@ websocket_handshake(State=#state{transport=Transport, key=Key},
%% Connection process.
-takeover(Parent, Ref, Socket, Transport, Opts, Buffer, {Req0, State=#state{handler=Handler}, HandlerState0}) ->
+%% @todo Keep parent and handle system messages.
+-spec takeover(pid(), ranch:ref(), inet:socket(), module(), any(), binary(),
+ {cowboy_req:req(), #state{}, any()}) -> ok.
+takeover(_Parent, Ref, Socket, Transport, _Opts, Buffer,
+ {Req0, State=#state{handler=Handler}, HandlerState0}) ->
ranch:remove_connection(Ref),
%% @todo Remove Req from Websocket callbacks.
%% @todo Allow sending a reply from websocket_init.