aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2012-12-03 14:13:46 +0100
committerLoïc Hoguin <[email protected]>2012-12-03 15:52:09 +0100
commit5ef4a15b48bfc1b5ca867b893b7cbd1b535175f7 (patch)
tree2749080d2ca52fc61f5ac8ab6a8e9f6470d46142 /src
parent067958abd200c1c3fbc1956d4c6c30bc5efd344c (diff)
downloadcowboy-5ef4a15b48bfc1b5ca867b893b7cbd1b535175f7.tar.gz
cowboy-5ef4a15b48bfc1b5ca867b893b7cbd1b535175f7.tar.bz2
cowboy-5ef4a15b48bfc1b5ca867b893b7cbd1b535175f7.zip
Allow passing the Req and an updated Opts when upgrading protocols
Diffstat (limited to 'src')
-rw-r--r--src/cowboy_protocol.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/cowboy_protocol.erl b/src/cowboy_protocol.erl
index 901a43c..cbedbfa 100644
--- a/src/cowboy_protocol.erl
+++ b/src/cowboy_protocol.erl
@@ -491,7 +491,9 @@ handler_init(Req, State=#state{transport=Transport}, Handler, Opts) ->
handler_terminate(Req2, Handler, HandlerState);
%% @todo {upgrade, transport, Module}
{upgrade, protocol, Module} ->
- upgrade_protocol(Req, State, Handler, Opts, Module)
+ upgrade_protocol(Req, State, Handler, Opts, Module);
+ {upgrade, protocol, Module, Req2, Opts2} ->
+ upgrade_protocol(Req2, State, Handler, Opts2, Module)
catch Class:Reason ->
error_terminate(500, State),
error_logger:error_msg(