umgeher/cowboy
0
Fork 0
mirror of https://github.com/ninenines/cowboy.git synced 2025-07-15 04:30:25 +00:00
Code Issues Wiki Activity

Merge branch 'fix_change_state' of https://github.com/nevar/cowboy

Browse source
This commit is contained in:
Loïc Hoguin 2013-01-22 17:30:05 +01:00
commit bcb1222df9
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/cowboy_rest.erl
View file

@ -740,13 +740,13 @@ choose_content_type(Req,
"** Request was ~p~n** State was ~p~n~n", "** Request was ~p~n** State was ~p~n~n",
[Handler, Fun, 2, cowboy_req:to_list(Req), HandlerState]), [Handler, Fun, 2, cowboy_req:to_list(Req), HandlerState]),
{error, 500, Req}; {error, 500, Req};
{halt, Req2, HandlerState} -> {halt, Req2, HandlerState2} ->
terminate(Req2, State#state{handler_state=HandlerState}); terminate(Req2, State#state{handler_state=HandlerState2});
{true, Req2, HandlerState} -> {true, Req2, HandlerState2} ->
State2 = State#state{handler_state=HandlerState}, State2 = State#state{handler_state=HandlerState2},
next(Req2, State2, OnTrue); next(Req2, State2, OnTrue);
{false, Req2, HandlerState} -> {false, Req2, HandlerState2} ->
State2 = State#state{handler_state=HandlerState}, State2 = State#state{handler_state=HandlerState2},
respond(Req2, State2, 500) respond(Req2, State2, 500)
end; end;
choose_content_type(Req, State, OnTrue, ContentType, [_Any|Tail]) -> choose_content_type(Req, State, OnTrue, ContentType, [_Any|Tail]) ->
@ -791,10 +791,10 @@ set_resp_body(Req, State=#state{handler=Handler, handler_state=HandlerState,
"** Request was ~p~n** State was ~p~n~n", "** Request was ~p~n** State was ~p~n~n",
[Handler, Fun, 2, cowboy_req:to_list(Req5), HandlerState]), [Handler, Fun, 2, cowboy_req:to_list(Req5), HandlerState]),
{error, 500, Req5}; {error, 500, Req5};
{halt, Req6, HandlerState} -> {halt, Req6, HandlerState2} ->
terminate(Req6, State4#state{handler_state=HandlerState}); terminate(Req6, State4#state{handler_state=HandlerState2});
{Body, Req6, HandlerState} -> {Body, Req6, HandlerState2} ->
State5 = State4#state{handler_state=HandlerState}, State5 = State4#state{handler_state=HandlerState2},
Req7 = case Body of Req7 = case Body of
{stream, StreamFun} -> {stream, StreamFun} ->
cowboy_req:set_resp_body_fun(StreamFun, Req6); cowboy_req:set_resp_body_fun(StreamFun, Req6);