aboutsummaryrefslogtreecommitdiffstats
path: root/src/cowboy_http_websocket.erl
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2011-12-22 22:09:08 +0100
committerLoïc Hoguin <[email protected]>2011-12-22 22:10:00 +0100
commit298ba1f1bbc501e8366c4fad4a636842c33ad030 (patch)
tree02e81d34cc7b65a9fc86fe8e03bd696d81f86b91 /src/cowboy_http_websocket.erl
parent17c9d45786b23983fbecc05d27add12def3fa087 (diff)
downloadcowboy-298ba1f1bbc501e8366c4fad4a636842c33ad030.tar.gz
cowboy-298ba1f1bbc501e8366c4fad4a636842c33ad030.tar.bz2
cowboy-298ba1f1bbc501e8366c4fad4a636842c33ad030.zip
Add 'Upgrade' header parsing
Not parsing product tokens, I don't see much point.
Diffstat (limited to 'src/cowboy_http_websocket.erl')
-rw-r--r--src/cowboy_http_websocket.erl7
1 files changed, 2 insertions, 5 deletions
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).