From b903aca33d6bf4ea72cf1c84d515cd21aab46d70 Mon Sep 17 00:00:00 2001 From: Adam Cammack Date: Sat, 9 Feb 2013 15:32:13 -0600 Subject: Make cowboy_http.erl compile with +native Worked until 27da092 --- src/cowboy_http.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/cowboy_http.erl b/src/cowboy_http.erl index f3ff687..1d19838 100644 --- a/src/cowboy_http.erl +++ b/src/cowboy_http.erl @@ -123,7 +123,7 @@ cookie_list(Data, Acc) -> (<< $,, Rest/binary >>) -> cookie_list(Rest, Acc); (<< $;, Rest/binary >>) -> cookie_list(Rest, Acc); (Rest) -> cookie(Rest, - fun (Rest2, << $$, _/bits >>, _) -> + fun (Rest2, << $$, _/binary >>, _) -> cookie_list(Rest2, Acc); (Rest2, Name, Value) -> cookie_list(Rest2, [{Name, Value}|Acc]) -- cgit v1.2.3 From 7f0c6bbb391280b8f8f35ad88ba79344deba9402 Mon Sep 17 00:00:00 2001 From: Adam Cammack Date: Sat, 9 Feb 2013 16:27:24 -0600 Subject: Make cowboy_websocket.erl compile with +native Worked until cccc0bc --- src/cowboy_websocket.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/cowboy_websocket.erl b/src/cowboy_websocket.erl index 1a87732..9bd6df6 100644 --- a/src/cowboy_websocket.erl +++ b/src/cowboy_websocket.erl @@ -256,7 +256,7 @@ websocket_data(State, Req, HandlerState, << Fin:1, _Rsv:3, Opcode:4, 1:1, websocket_data(State, Req, HandlerState, Opcode, Len, MaskKey, Rest, Fin); %% When payload length is over 63 bits, the most significant bit MUST be 0. -websocket_data(State, Req, HandlerState, << _:8, 1:1, 127:7, 1:1, _/bits >>) -> +websocket_data(State, Req, HandlerState, << _:8, 1:1, 127:7, 1:1, _:7, _/binary >>) -> websocket_close(State, Req, HandlerState, {error, badframe}); %% All frames sent from the client to the server are masked. websocket_data(State, Req, HandlerState, << _:8, 0:1, _/bits >>) -> -- cgit v1.2.3