Skip to content

On pool redirect, don't return client ref as connection is already cleaned up #785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

On pool redirect, don't return client ref as connection is already cleaned up #785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 1 deletion src/hackney.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1131,7 +1131,8 @@ reply_response({ok, Status, Headers, #client{request_ref=Ref}=NState}, _State) -
_ ->
%% For custom pools, use full cleanup to ensure connection release
maybe_update_req(CleanNState),
{ok, Status, Headers, Ref}
%% Dont return client ref as connection is already cleaned up
{ok, Status, Headers}
end;
Error ->
hackney_manager:handle_error(NState),
Expand Down
19 changes: 4 additions & 15 deletions test/hackney_integration_tests.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,14 +232,8 @@ test_307_redirect_pool_cleanup() ->
{ok, {maybe_redirect, 307, _Headers1, Client1}} ->
{skip, _} = hackney:skip_body(Client1),
ok;
{ok, Status1, _Headers1, ClientOrRef1} when Status1 >= 300, Status1 < 400 ->
%% If it's a reference, we can't call skip_body - the connection handling is different
if is_reference(ClientOrRef1) ->
ok; %% Connection handling is managed internally for pooled requests
true ->
{skip, _} = hackney:skip_body(ClientOrRef1),
ok
end;
{ok, Status1, _Headers1} when Status1 >= 300, Status1 < 400 ->
ok;
{ok, Status1, _Headers1, Client1} when Status1 >= 200, Status1 < 400 ->
{ok, _Body} = hackney:body(Client1),
ok;
Expand All @@ -254,13 +248,8 @@ test_307_redirect_pool_cleanup() ->
{ok, {maybe_redirect, 307, _Headers2, Client2}} ->
{skip, _} = hackney:skip_body(Client2),
ok;
{ok, Status2, _Headers2, ClientOrRef2} when Status2 >= 300, Status2 < 400 ->
if is_reference(ClientOrRef2) ->
ok; %% Connection handling is managed internally for pooled requests
true ->
{skip, _} = hackney:skip_body(ClientOrRef2),
ok
end;
{ok, Status2, _Headers2} when Status2 >= 300, Status2 < 400 ->
ok;
{ok, Status2, _Headers2, Client2} when Status2 >= 200, Status2 < 400 ->
{ok, _Body2} = hackney:body(Client2),
ok;
Expand Down