diff options
| author | Loïc Hoguin <[email protected]> | 2013-02-14 17:50:49 +0100 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2013-02-14 17:50:49 +0100 |
| commit | 0218249c2178db75dc2f592dbe6d0a92160f204a (patch) | |
| tree | 83463b78f071e378fefa49789e52664266cf470b | |
| parent | 46cce4814390a2917563ce7af82e0e1bbfc81ed3 (diff) | |
| parent | 7f0c6bbb391280b8f8f35ad88ba79344deba9402 (diff) | |
| download | cowboy-0218249c2178db75dc2f592dbe6d0a92160f204a.tar.gz cowboy-0218249c2178db75dc2f592dbe6d0a92160f204a.tar.bz2 cowboy-0218249c2178db75dc2f592dbe6d0a92160f204a.zip | |
Merge branch 'native_compile' of git://github.com/acammack/cowboy
| -rw-r--r-- | src/cowboy_http.erl | 2 | ||||
| -rw-r--r-- | src/cowboy_websocket.erl | 2 |
2 files changed, 2 insertions, 2 deletions
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]) 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 >>) -> |