From 99d8f837fe4af42edfdba1e83659f1ca8d75d17d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Mon, 5 Dec 2011 07:54:56 +0100 Subject: Fix specs to allow headers as iodata() and not just binary() --- include/http.hrl | 2 +- src/cowboy_http_req.erl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/http.hrl b/include/http.hrl index d4fba18..d1ca0aa 100644 --- a/include/http.hrl +++ b/include/http.hrl @@ -33,7 +33,7 @@ | 'Expires' | 'Last-Modified' | 'Accept-Ranges' | 'Set-Cookie' | 'Set-Cookie2' | 'X-Forwarded-For' | 'Cookie' | 'Keep-Alive' | 'Proxy-Connection' | binary(). --type http_headers() :: list({http_header(), binary()}). +-type http_headers() :: list({http_header(), iodata()}). -type http_cookies() :: list({binary(), binary()}). -type http_status() :: non_neg_integer() | binary(). diff --git a/src/cowboy_http_req.erl b/src/cowboy_http_req.erl index f457d4f..66c8853 100644 --- a/src/cowboy_http_req.erl +++ b/src/cowboy_http_req.erl @@ -363,7 +363,7 @@ body_qs(Req) -> %% Response API. %% @doc Add a header to the response. --spec set_resp_header(http_header(), binary(), #http_req{}) +-spec set_resp_header(http_header(), iodata(), #http_req{}) -> {ok, #http_req{}}. set_resp_header(Name, Value, Req=#http_req{resp_headers=RespHeaders}) -> NameBin = header_to_binary(Name), @@ -373,7 +373,7 @@ set_resp_header(Name, Value, Req=#http_req{resp_headers=RespHeaders}) -> %% %% The body set here is ignored if the response is later sent using %% anything other than reply/2 or reply/3. --spec set_resp_body(binary(), #http_req{}) -> {ok, #http_req{}}. +-spec set_resp_body(iodata(), #http_req{}) -> {ok, #http_req{}}. set_resp_body(Body, Req) -> {ok, Req#http_req{resp_body=Body}}. -- cgit v1.2.3