aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2013-05-16 15:14:11 +0200
committerLoïc Hoguin <[email protected]>2013-05-16 15:14:11 +0200
commit934393a16884729bee6b7a9418eee2262af9c216 (patch)
tree08ae952737cce0fd1a1e89013d7adee1363101cb
parent28186a68d0c023987fe7334b0326fb6c87f9447c (diff)
downloadcowboy-934393a16884729bee6b7a9418eee2262af9c216.tar.gz
cowboy-934393a16884729bee6b7a9418eee2262af9c216.tar.bz2
cowboy-934393a16884729bee6b7a9418eee2262af9c216.zip
Make the return value of AcceptResource callback consistent
-rw-r--r--src/cowboy_rest.erl2
-rw-r--r--test/http_SUITE_data/rest_forbidden_resource.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/cowboy_rest.erl b/src/cowboy_rest.erl
index b44ccef..494a1e3 100644
--- a/src/cowboy_rest.erl
+++ b/src/cowboy_rest.erl
@@ -842,7 +842,7 @@ process_content_type(Req, State=#state{method=Method,
{false, Req2, HandlerState2} ->
State2 = State#state{handler_state=HandlerState2},
respond(Req2, State2, 422);
- {ResURL, Req2, HandlerState2} when Method =:= <<"POST">> ->
+ {{true, ResURL}, Req2, HandlerState2} when Method =:= <<"POST">> ->
State2 = State#state{handler_state=HandlerState2},
Req3 = cowboy_req:set_resp_header(
<<"location">>, ResURL, Req2),
diff --git a/test/http_SUITE_data/rest_forbidden_resource.erl b/test/http_SUITE_data/rest_forbidden_resource.erl
index 287ff62..920ba31 100644
--- a/test/http_SUITE_data/rest_forbidden_resource.erl
+++ b/test/http_SUITE_data/rest_forbidden_resource.erl
@@ -28,4 +28,4 @@ to_text(Req, State) ->
from_text(Req, State) ->
{Path, Req2} = cowboy_req:path(Req),
- {Path, Req2, State}.
+ {{true, Path}, Req2, State}.