diff options
| author | Loïc Hoguin <[email protected]> | 2011-12-12 07:54:56 +0100 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2011-12-12 07:54:56 +0100 |
| commit | a37dd714e0fc8900bc7b7eda35ecfcb465f06043 (patch) | |
| tree | 4c993f1e415bcfe324fd14c6fc8750bc393ba1c2 /src/cowboy_http_websocket.erl | |
| parent | 7c1372df2077e5c4b81c946c813235a77a399b63 (diff) | |
| parent | b1bbd023c54def70cf748ff78c02b8b021e87c18 (diff) | |
| download | cowboy-a37dd714e0fc8900bc7b7eda35ecfcb465f06043.tar.gz cowboy-a37dd714e0fc8900bc7b7eda35ecfcb465f06043.tar.bz2 cowboy-a37dd714e0fc8900bc7b7eda35ecfcb465f06043.zip | |
Merge branch 'hipe-compilation-fix' of github.com:klaar/cowboy
Diffstat (limited to 'src/cowboy_http_websocket.erl')
| -rw-r--r-- | src/cowboy_http_websocket.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cowboy_http_websocket.erl b/src/cowboy_http_websocket.erl index 7013d7f..20060e6 100644 --- a/src/cowboy_http_websocket.erl +++ b/src/cowboy_http_websocket.erl @@ -244,11 +244,11 @@ websocket_data(State, Req, HandlerState, <<>>) -> handler_before_loop(State, Req, HandlerState, <<>>); %% hixie-76 close frame. websocket_data(State=#state{version=0}, Req, HandlerState, - << 255, 0, _Rest/bits >>) -> + << 255, 0, _Rest/binary >>) -> websocket_close(State, Req, HandlerState, {normal, closed}); %% hixie-76 data frame. We only support the frame type 0, same as the specs. websocket_data(State=#state{version=0, eop=EOP}, Req, HandlerState, - Data = << 0, _/bits >>) -> + Data = << 0, _/binary >>) -> case binary:match(Data, EOP) of {Pos, 1} -> Pos2 = Pos - 1, |