diff options
| author | Loïc Hoguin <[email protected]> | 2012-09-16 03:51:07 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2012-09-17 13:56:58 +0200 |
| commit | 8d5f8db90a10a8ca16f8f17bcb076ff4b93e9c63 (patch) | |
| tree | 916b1c238ce6dea4652e7b50341c37128ba633b2 /src/cowboy_websocket.erl | |
| parent | e13ab806eaadd40c72145b5783c7727f2ed88d14 (diff) | |
| download | cowboy-8d5f8db90a10a8ca16f8f17bcb076ff4b93e9c63.tar.gz cowboy-8d5f8db90a10a8ca16f8f17bcb076ff4b93e9c63.tar.bz2 cowboy-8d5f8db90a10a8ca16f8f17bcb076ff4b93e9c63.zip | |
Improve consistency of return types for cowboy_req API
The signature of parse_header, body_qs, multipart_data and
the set_resp_* functions has changed.
See the cowboy_req module edoc for more details.
Diffstat (limited to 'src/cowboy_websocket.erl')
| -rw-r--r-- | src/cowboy_websocket.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cowboy_websocket.erl b/src/cowboy_websocket.erl index 7382344..a6f2be3 100644 --- a/src/cowboy_websocket.erl +++ b/src/cowboy_websocket.erl @@ -71,11 +71,11 @@ upgrade(ListenerPid, Handler, Opts, Req) -> -spec websocket_upgrade(#state{}, Req) -> {ok, #state{}, Req} when Req::cowboy_req:req(). websocket_upgrade(State, Req) -> - {ConnTokens, Req2} + {ok, ConnTokens, Req2} = cowboy_req:parse_header('Connection', Req), true = lists:member(<<"upgrade">>, ConnTokens), %% @todo Should probably send a 426 if the Upgrade header is missing. - {[<<"websocket">>], Req3} = cowboy_req:parse_header('Upgrade', Req2), + {ok, [<<"websocket">>], Req3} = cowboy_req:parse_header('Upgrade', Req2), {Version, Req4} = cowboy_req:header(<<"Sec-Websocket-Version">>, Req3), websocket_upgrade(Version, State, Req4). |