aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMagnus Klaar <[email protected]>2011-12-16 16:19:08 +0100
committerMagnus Klaar <[email protected]>2011-12-16 16:29:13 +0100
commitfed1410b14ce284266b11c149f608bb49ed7ffbb (patch)
treece111b557b2e9964ce10179c0b05ba063b531328
parent621411350a754852317d6a1c3ecfe8e5356ef12f (diff)
downloadcowboy-fed1410b14ce284266b11c149f608bb49ed7ffbb.tar.gz
cowboy-fed1410b14ce284266b11c149f608bb49ed7ffbb.tar.bz2
cowboy-fed1410b14ce284266b11c149f608bb49ed7ffbb.zip
update type of resp_body to iodata
resp_body is set by cowboy_http_req:set_resp_body/2 which accepts the input type iodata(). Update the resp_body field to use the same type. Also update the cowboy_http_req:has_resp_body/2 function to use the iolist_size/1 which works with both binary() and iolist() values instead of the byte_size/1 function which only works with binary() values.
-rw-r--r--include/http.hrl2
-rw-r--r--src/cowboy_http_req.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/http.hrl b/include/http.hrl
index fd0eecc..e5311c4 100644
--- a/include/http.hrl
+++ b/include/http.hrl
@@ -68,7 +68,7 @@
%% Response.
resp_state = waiting :: locked | waiting | chunks | done,
resp_headers = [] :: http_headers(),
- resp_body = <<>> :: binary(),
+ resp_body = <<>> :: iodata(),
%% Functions.
urldecode :: {fun((binary(), T) -> binary()), T}
diff --git a/src/cowboy_http_req.erl b/src/cowboy_http_req.erl
index b8bb8d2..e40bbc6 100644
--- a/src/cowboy_http_req.erl
+++ b/src/cowboy_http_req.erl
@@ -416,7 +416,7 @@ has_resp_header(Name, #http_req{resp_headers=RespHeaders}) ->
%% @doc Return whether a body has been set for the response.
-spec has_resp_body(#http_req{}) -> boolean().
has_resp_body(#http_req{resp_body=RespBody}) ->
- byte_size(RespBody) > 0.
+ iolist_size(RespBody) > 0.
%% @equiv reply(Status, [], [], Req)
-spec reply(http_status(), #http_req{}) -> {ok, #http_req{}}.