Allow to specify a port from the conn (#1187)

elixir-plug · Jan 5, 2024 · 59ea007 · 59ea007
1 parent 2e078cf
commit 59ea007
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/plug/adapters/test/conn.ex b/lib/plug/adapters/test/conn.ex
@@ -36,14 +36,16 @@ defmodule Plug.Adapters.Test.Conn do
         })
     }
 
+    conn_port = if conn.port != 0, do: conn.port, else: 80
+
     %Plug.Conn{
       conn
       | adapter: {__MODULE__, state},
         host: uri.host || conn.host || "www.example.com",
         method: method,
         owner: owner,
         path_info: split_path(uri.path),
-        port: uri.port || 80,
+        port: uri.port || conn_port,
         remote_ip: conn.remote_ip || {127, 0, 0, 1},
         req_headers: req_headers,
         request_path: uri.path,

diff --git a/test/plug/adapters/test/conn_test.exs b/test/plug/adapters/test/conn_test.exs
@@ -152,6 +152,12 @@ defmodule Plug.Adapters.Test.ConnTest do
     assert child_conn.remote_ip == {151, 236, 219, 228}
   end
 
+  test "use existing conn.port if exists" do
+    conn_with_port = %Plug.Conn{conn(:get, "/") | port: 4200}
+    child_conn = Plug.Adapters.Test.Conn.conn(conn_with_port, :get, "/", foo: "bar")
+    assert child_conn.port == 4200
+  end
+
   test "use custom peer data" do
     peer_data = %{address: {127, 0, 0, 1}, port: 111_317}
     conn = conn(:get, "/") |> put_peer_data(peer_data)