aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2013-01-29 12:11:12 +0100
committerLoïc Hoguin <[email protected]>2013-01-29 12:11:12 +0100
commitbdc8342595a8f996db20717992242a5917d496e0 (patch)
tree914285ca6bcb052c541caee108ef4333fb63f1a8 /src
parent747bfc29ee951841f38d6e8d471041d6a3008d60 (diff)
parent0d93c96b31734e2309a45dc151c447beaf23f20f (diff)
downloadcowboy-bdc8342595a8f996db20717992242a5917d496e0.tar.gz
cowboy-bdc8342595a8f996db20717992242a5917d496e0.tar.bz2
cowboy-bdc8342595a8f996db20717992242a5917d496e0.zip
Merge branch 'fix/callback_specs' of https://github.com/keynslug/cowboy
Diffstat (limited to 'src')
-rw-r--r--src/cowboy_http_handler.erl1
-rw-r--r--src/cowboy_loop_handler.erl1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/cowboy_http_handler.erl b/src/cowboy_http_handler.erl
index 9c7aaa6..0393153 100644
--- a/src/cowboy_http_handler.erl
+++ b/src/cowboy_http_handler.erl
@@ -45,6 +45,7 @@
| {loop, Req, state(), timeout(), hibernate}
| {shutdown, Req, state()}
| {upgrade, protocol, module()}
+ | {upgrade, protocol, module(), Req, opts()}
when Req::cowboy_req:req().
-callback handle(Req, State) -> {ok, Req, State}
when Req::cowboy_req:req(), State::state().
diff --git a/src/cowboy_loop_handler.erl b/src/cowboy_loop_handler.erl
index 71323d2..f8d008f 100644
--- a/src/cowboy_loop_handler.erl
+++ b/src/cowboy_loop_handler.erl
@@ -51,6 +51,7 @@
| {loop, Req, state(), timeout(), hibernate}
| {shutdown, Req, state()}
| {upgrade, protocol, module()}
+ | {upgrade, protocol, module(), Req, opts()}
when Req::cowboy_req:req().
-callback info(any(), Req, State)
-> {ok, Req, State}