aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2012-12-07 16:35:40 +0100
committerLoïc Hoguin <[email protected]>2012-12-07 16:35:40 +0100
commitd2ccd2e0900b79045f8502f264ad938c65b46f1d (patch)
tree80d2ecf4ce7baaaa5060bcd656444becf5aa6676 /src
parent181d0edc52673e92e10eec88591243ec43cfed9b (diff)
parentae2a6cfb688d0aaeac35234d88d9f7c615b7c8f9 (diff)
downloadcowboy-d2ccd2e0900b79045f8502f264ad938c65b46f1d.tar.gz
cowboy-d2ccd2e0900b79045f8502f264ad938c65b46f1d.tar.bz2
cowboy-d2ccd2e0900b79045f8502f264ad938c65b46f1d.zip
Merge branch 'websocket_terminate_not_called' of git://github.com/dergraf/cowboy
Diffstat (limited to 'src')
-rw-r--r--src/cowboy_websocket.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cowboy_websocket.erl b/src/cowboy_websocket.erl
index 295767b..c53fe89 100644
--- a/src/cowboy_websocket.erl
+++ b/src/cowboy_websocket.erl
@@ -175,7 +175,8 @@ websocket_handshake(State=#state{socket=Socket, transport=Transport,
handler_before_loop(State#state{messages=Transport:messages()},
Req4, HandlerState, <<>>);
_Any ->
- closed %% If an error happened reading the body, stop there.
+ %% If an error happened reading the body, stop there.
+ handler_terminate(State, Req3, HandlerState, {error, closed})
end;
websocket_handshake(State=#state{transport=Transport, challenge=Challenge},
Req, HandlerState) ->