Skip to content

Fix register_before_send with upgrade_adapter #1320

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

Merged
josevalim merged 3 commits into from
Jun 30, 2026
+15 −4
Merged

Fix register_before_send with upgrade_adapter #1320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f664a53
Fix register_before_send with upgrade_adapter
SteffenDE Jun 30, 2026
d63611f
test
SteffenDE Jun 30, 2026
8e571d0
set status to 101 (switching protocols)
SteffenDE Jun 30, 2026
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
7 changes: 4 additions & 3 deletions lib/plug/conn.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ defmodule Plug.Conn do
alias Plug.Conn
@epoch {{1970, 1, 1}, {0, 0, 0}}
@already_sent {:plug_conn, :sent}
@unsent [:unset, :set, :set_chunked, :set_file]
@unsent [:unset, :set, :set_upgrade, :set_chunked, :set_file]

@doc """
Assigns a value to a key in the connection.
Expand Down Expand Up @@ -1471,10 +1471,11 @@ defmodule Plug.Conn do
@spec upgrade_adapter(t, atom, term) :: t
def upgrade_adapter(%Conn{adapter: {adapter, payload}, state: state} = conn, protocol, args)
when state in @unsent do
conn = run_before_send(%{conn | status: 101}, :set_upgrade)

case adapter.upgrade(payload, protocol, args) do
{:ok, payload} ->
conn = run_before_send(conn, :upgraded)
%{conn | adapter: {adapter, payload}}
%{conn | state: :upgraded, adapter: {adapter, payload}}

@SteffenDE SteffenDE Jun 30, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we should set status: 101 here for phoenixframework/phoenix#6741.


{:error, :not_supported} ->
raise ArgumentError, "upgrade to #{protocol} not supported by #{inspect(adapter)}"
Expand Down
12 changes: 11 additions & 1 deletion test/plug/conn_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,9 +510,19 @@ defmodule Plug.ConnTest do
test "upgrade_adapter/3 runs before_send callbacks" do
conn =
conn(:get, "/foo")
|> register_before_send(&assign(&1, :ran_before_send, true))
|> register_before_send(fn conn ->
send(self(), {:state, conn.state})
assert conn.status == 101

conn
|> put_resp_header("x-test", "UPGRADE")
|> assign(:ran_before_send, true)
end)
|> upgrade_adapter(:supported, opt: :supported)

assert_receive {:state, :set_upgrade}

assert {"x-test", "UPGRADE"} in conn.resp_headers
assert conn.assigns[:ran_before_send] == true
end

Expand Down