diff options
| author | Loïc Hoguin <[email protected]> | 2011-12-17 13:24:54 +0100 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2011-12-17 13:24:54 +0100 |
| commit | 740931131b06bfc3ec830312d52d87ab7e8a932d (patch) | |
| tree | ce111b557b2e9964ce10179c0b05ba063b531328 | |
| parent | 621411350a754852317d6a1c3ecfe8e5356ef12f (diff) | |
| parent | fed1410b14ce284266b11c149f608bb49ed7ffbb (diff) | |
| download | cowboy-740931131b06bfc3ec830312d52d87ab7e8a932d.tar.gz cowboy-740931131b06bfc3ec830312d52d87ab7e8a932d.tar.bz2 cowboy-740931131b06bfc3ec830312d52d87ab7e8a932d.zip | |
Merge branch 'resp-body-fix' of github.com:klaar/cowboy
| -rw-r--r-- | include/http.hrl | 2 | ||||
| -rw-r--r-- | src/cowboy_http_req.erl | 2 |
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{}}. |