aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2013-02-14 18:15:18 +0100
committerLoïc Hoguin <[email protected]>2013-02-14 18:15:18 +0100
commitbc340478c86340833c4c2def2a77f4828509c334 (patch)
treec2da17faf38c7c53b053916544cb69b0a965b287 /src
parent0218249c2178db75dc2f592dbe6d0a92160f204a (diff)
parentb44ccf59e66cf7ce24be41a29807138d2bebcb3c (diff)
downloadcowboy-bc340478c86340833c4c2def2a77f4828509c334.tar.gz
cowboy-bc340478c86340833c4c2def2a77f4828509c334.tar.bz2
cowboy-bc340478c86340833c4c2def2a77f4828509c334.zip
Merge branch 'fix/websocket_callback_specs' of git://github.com/keynslug/cowboy
Diffstat (limited to 'src')
-rw-r--r--src/cowboy_websocket_handler.erl3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/cowboy_websocket_handler.erl b/src/cowboy_websocket_handler.erl
index bd2ed5a..8bbbc08 100644
--- a/src/cowboy_websocket_handler.erl
+++ b/src/cowboy_websocket_handler.erl
@@ -53,6 +53,9 @@
-type terminate_reason() :: {normal, shutdown}
| {normal, timeout}
| {error, closed}
+ | {remote, closed}
+ | {remote, cowboy_websocket:close_code(), binary()}
+ | {error, badencoding}
| {error, badframe}
| {error, atom()}.