From 298ba1f1bbc501e8366c4fad4a636842c33ad030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Thu, 22 Dec 2011 22:09:08 +0100 Subject: Add 'Upgrade' header parsing Not parsing product tokens, I don't see much point. --- src/cowboy_http_websocket.erl | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/cowboy_http_websocket.erl') diff --git a/src/cowboy_http_websocket.erl b/src/cowboy_http_websocket.erl index 08804b1..058c843 100644 --- a/src/cowboy_http_websocket.erl +++ b/src/cowboy_http_websocket.erl @@ -72,16 +72,13 @@ upgrade(ListenerPid, Handler, Opts, Req) -> {'EXIT', _Reason} -> upgrade_error(Req) end. -%% @todo We need a function to properly parse headers according to their ABNF, -%% instead of having ugly code like this case here. -%% @todo Upgrade is a list of products and should be parsed as such. -spec websocket_upgrade(#state{}, #http_req{}) -> {ok, #state{}, #http_req{}}. websocket_upgrade(State, Req) -> {ConnTokens, Req2} = cowboy_http_req:parse_header('Connection', Req), true = lists:member(<<"upgrade">>, ConnTokens), - {WS, Req3} = cowboy_http_req:header('Upgrade', Req2), - <<"websocket">> = cowboy_bstr:to_lower(WS), + %% @todo Should probably send a 426 if the Upgrade header is missing. + {[<<"websocket">>], Req3} = cowboy_http_req:parse_header('Upgrade', Req2), {Version, Req4} = cowboy_http_req:header(<<"Sec-Websocket-Version">>, Req3), websocket_upgrade(Version, State, Req4). -- cgit v1.2.3