aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2018-06-26 10:59:22 +0200
committerLoïc Hoguin <[email protected]>2018-06-26 10:59:22 +0200
commit5001fcbc345846efe2de6983e4f0784895b03ce8 (patch)
treed010892284bcab6c1748699a544ba004cd33137d
parent7867e435fe6262d783f797c659e215dc14096449 (diff)
downloadcowboy-5001fcbc345846efe2de6983e4f0784895b03ce8.tar.gz
cowboy-5001fcbc345846efe2de6983e4f0784895b03ce8.tar.bz2
cowboy-5001fcbc345846efe2de6983e4f0784895b03ce8.zip
Add missing frame types to websocket_handle specs/docs
Thanks Artem.
-rw-r--r--doc/src/manual/cowboy_websocket.asciidoc2
-rw-r--r--src/cowboy_websocket.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/manual/cowboy_websocket.asciidoc b/doc/src/manual/cowboy_websocket.asciidoc
index d52bd83..d8b223c 100644
--- a/doc/src/manual/cowboy_websocket.asciidoc
+++ b/doc/src/manual/cowboy_websocket.asciidoc
@@ -31,7 +31,7 @@ Req :: cowboy_req:req()
PartialReq :: map()
State :: any()
Opts :: cowboy_websocket:opts()
-InFrame :: {text | binary | ping | pong, binary()}
+InFrame :: ping | pong | {text | binary | ping | pong, binary()}
OutFrame :: cow_ws:frame() %% see types below
Info :: any()
diff --git a/src/cowboy_websocket.erl b/src/cowboy_websocket.erl
index 1469c00..48816d8 100644
--- a/src/cowboy_websocket.erl
+++ b/src/cowboy_websocket.erl
@@ -47,7 +47,7 @@
-> call_result(State) when State::any().
-optional_callbacks([websocket_init/1]).
--callback websocket_handle({text | binary | ping | pong, binary()}, State)
+-callback websocket_handle(ping | pong | {text | binary | ping | pong, binary()}, State)
-> call_result(State) when State::any().
-callback websocket_info(any(), State)
-> call_result(State) when State::any().