Merge branch 'native_compile' of git://github.com/acammack/cowboy

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])

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 >>) ->