0
Fork 0
mirror of https://github.com/ninenines/cowboy.git synced 2025-07-14 12:20:24 +00:00

Merge branch 'fix-rest-stacktrace' of https://github.com/danielwhite/cowboy into 1.0.x

This commit is contained in:
Loïc Hoguin 2015-07-02 21:56:08 +02:00
commit df1b3dcd0e

View file

@ -1003,8 +1003,8 @@ terminate(Req, State=#state{env=Env}) ->
error_terminate(Req, State=#state{handler=Handler, handler_state=HandlerState}, error_terminate(Req, State=#state{handler=Handler, handler_state=HandlerState},
Class, Reason, Callback) -> Class, Reason, Callback) ->
rest_terminate(Req, State),
Stacktrace = erlang:get_stacktrace(), Stacktrace = erlang:get_stacktrace(),
rest_terminate(Req, State),
cowboy_req:maybe_reply(Stacktrace, Req), cowboy_req:maybe_reply(Stacktrace, Req),
erlang:Class([ erlang:Class([
{reason, Reason}, {reason, Reason},