From 1d413ea51b29de270a737de4c97fcdd8656541ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Thu, 16 May 2013 17:01:38 +0200 Subject: Move cowboy_protocol:onresponse_fun() to cowboy:onresponse_fun() --- src/cowboy.erl | 4 ++++ src/cowboy_protocol.erl | 6 +----- src/cowboy_req.erl | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/cowboy.erl b/src/cowboy.erl index 07dd4b4..375f924 100644 --- a/src/cowboy.erl +++ b/src/cowboy.erl @@ -32,6 +32,10 @@ -type onrequest_fun() :: fun((Req) -> Req). -export_type([onrequest_fun/0]). +-type onresponse_fun() :: + fun((http_status(), http_headers(), iodata(), Req) -> Req). +-export_type([onresponse_fun/0]). + %% @doc Start an HTTP listener. -spec start_http(any(), non_neg_integer(), any(), any()) -> {ok, pid()}. start_http(Ref, NbAcceptors, TransOpts, ProtoOpts) diff --git a/src/cowboy_protocol.erl b/src/cowboy_protocol.erl index d431667..4874e9a 100644 --- a/src/cowboy_protocol.erl +++ b/src/cowboy_protocol.erl @@ -56,10 +56,6 @@ -export([parse_request/3]). -export([resume/6]). --type onresponse_fun() :: - fun((cowboy:http_status(), cowboy:http_headers(), iodata(), Req) -> Req). --export_type([onresponse_fun/0]). - -record(state, { socket :: inet:socket(), transport :: module(), @@ -67,7 +63,7 @@ compress :: boolean(), env :: cowboy_middleware:env(), onrequest :: undefined | cowboy:onrequest_fun(), - onresponse = undefined :: undefined | onresponse_fun(), + onresponse = undefined :: undefined | cowboy:onresponse_fun(), max_empty_lines :: non_neg_integer(), req_keepalive = 1 :: non_neg_integer(), max_keepalive :: non_neg_integer(), diff --git a/src/cowboy_req.erl b/src/cowboy_req.erl index e522907..d0f2a35 100644 --- a/src/cowboy_req.erl +++ b/src/cowboy_req.erl @@ -174,7 +174,7 @@ %% Functions. onresponse = undefined :: undefined | already_called - | cowboy_protocol:onresponse_fun() + | cowboy:onresponse_fun() }). -opaque req() :: #http_req{}. @@ -194,7 +194,7 @@ binary(), binary(), binary(), cowboy:http_version(), cowboy:http_headers(), binary(), inet:port_number() | undefined, binary(), boolean(), boolean(), - undefined | cowboy_protocol:onresponse_fun()) + undefined | cowboy:onresponse_fun()) -> req(). new(Socket, Transport, Peer, Method, Path, Query, Version, Headers, Host, Port, Buffer, CanKeepalive, -- cgit v1.2.3