Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions guides/middleware.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ no registry, no deps.

-type response() :: {ok, integer(), list(), binary()}
| {ok, integer(), list()} %% HEAD
| {ok, reference()} %% async
| {ok, pid()} %% streaming upload
| {ok, pid()} %% async or streaming upload
| {error, term()}.

-type next() :: fun((request()) -> response()).
Expand Down
2 changes: 1 addition & 1 deletion src/hackney.erl
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
-type request_ret() ::
{ok, integer(), list(), binary()} | %% response with body
{ok, integer(), list()} | %% HEAD request
{ok, reference()} | %% async mode
{ok, conn()} | %% async mode or streaming body upload (body = stream)
{error, term()}.
-export_type([url/0, conn/0, request_ret/0]).

Expand Down
9 changes: 4 additions & 5 deletions src/hackney_conn.erl
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@
pool_pid :: pid() | undefined, %% If set, connection is from a pool

%% Request tracking
request_ref :: reference() | undefined,
request_from :: {pid(), reference()} | undefined,
method :: binary() | undefined,
path :: binary() | undefined,
Expand Down Expand Up @@ -344,25 +343,25 @@ stream_body(Pid) ->
%% - {hackney_response, Ref, {see_other, Location, Headers}} for 303 with POST
%% AsyncMode: true (continuous) or once (one message at a time, use stream_next/1)
-spec request_async(pid(), binary(), binary(), list(), binary() | iolist(), true | once) ->
{ok, reference()} | {error, term()}.
{ok, pid()} | {error, term()}.
request_async(Pid, Method, Path, Headers, Body, AsyncMode) ->
request_async(Pid, Method, Path, Headers, Body, AsyncMode, self(), false).

-spec request_async(pid(), binary(), binary(), list(), binary() | iolist(), true | once, pid()) ->
{ok, reference()} | {error, term()}.
{ok, pid()} | {error, term()}.
request_async(Pid, Method, Path, Headers, Body, AsyncMode, StreamTo) ->
request_async(Pid, Method, Path, Headers, Body, AsyncMode, StreamTo, false).

-spec request_async(pid(), binary(), binary(), list(), binary() | iolist(), true | once, pid(), boolean()) ->
{ok, reference()} | {error, term()}.
{ok, pid()} | {error, term()}.
request_async(Pid, Method, Path, Headers, Body, AsyncMode, StreamTo, FollowRedirect) ->
case valid_request_target(Path) of
ok -> gen_statem:call(Pid, {request_async, Method, Path, Headers, Body, AsyncMode, StreamTo, FollowRedirect});
Err -> Err
end.

-spec request_async(pid(), binary(), binary(), list(), binary() | iolist(), true | once, pid(), boolean(), list()) ->
{ok, reference()} | {error, term()}.
{ok, pid()} | {error, term()}.
request_async(Pid, Method, Path, Headers, Body, AsyncMode, StreamTo, FollowRedirect, ReqOpts) ->
case valid_request_target(Path) of
ok -> gen_statem:call(Pid, {request_async, Method, Path, Headers, Body, AsyncMode, StreamTo, FollowRedirect, ReqOpts});
Expand Down
1 change: 0 additions & 1 deletion src/hackney_middleware.erl
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@

-type response() :: {ok, integer(), list(), binary()}
| {ok, integer(), list()}
| {ok, reference()}
| {ok, pid()}
| {error, term()}.

Expand Down
Loading