Merge commit from fork

Author: mtrudel

lib/bandit/pipeline.ex

@@ -73,22 +73,17 @@ defmodule Bandit.Pipeline do
         ) :: Plug.Conn.t()
   defp build_conn!(transport, method, request_target, headers, {secure?, peer_address}, opts) do
     adapter = Bandit.Adapter.init(self(), transport, method, headers, opts)
-    scheme = determine_scheme(secure?, request_target)
+    scheme = determine_scheme(secure?)
     version = Bandit.HTTPTransport.version(transport)
     {host, port} = determine_host_and_port!(scheme, version, request_target, headers)
     {path, query} = determine_path_and_query(request_target)
     uri = %URI{scheme: scheme, host: host, port: port, path: path, query: query}
     Plug.Conn.Adapter.conn({Bandit.Adapter, adapter}, method, uri, peer_address, headers)
   end
 
-  @spec determine_scheme(boolean(), request_target()) :: String.t() | nil
-  defp determine_scheme(secure?, {scheme, _, _, _}) do
-    case {secure?, scheme} do
-      {true, nil} -> "https"
-      {false, nil} -> "http"
-      {_, scheme} -> scheme
-    end
-  end
+  @spec determine_scheme(boolean()) :: String.t()
+  defp determine_scheme(true), do: "https"
+  defp determine_scheme(false), do: "http"
 
   @spec determine_host_and_port!(binary(), atom(), request_target(), Plug.Conn.headers()) ::
           {Plug.Conn.host(), Plug.Conn.port_number()}

test/bandit/http1/protocol_test.exs

@@ -520,11 +520,11 @@ defmodule HTTP1ProtocolTest do
   end
 
   describe "absolute-form request target (RFC9112§3.2.2)" do
-    test "uses request-line scheme even if it does not match the transport", context do
+    test "uses transport scheme even if it does not match request-line scheme", context do
       client = SimpleHTTP1Client.tcp_client(context)
       SimpleHTTP1Client.send(client, "GET", "https://banana/echo_components")
       assert {:ok, "200 OK", _headers, body} = SimpleHTTP1Client.recv_reply(client)
-      assert Jason.decode!(body)["scheme"] == "https"
+      assert Jason.decode!(body)["scheme"] == "http"
     end
 
     test "derives host from the URI, even if it differs from host header", context do

test/bandit/http2/protocol_test.exs

@@ -2649,7 +2649,7 @@ defmodule HTTP2ProtocolTest do
       assert Jason.decode!(body)["scheme"] == "https"
     end
 
-    test "uses :scheme even if it does not match transport", context do
+    test "uses transport even if it does not match :scheme", context do
       socket = SimpleH2Client.setup_connection(context)
 
       headers = [
@@ -2663,7 +2663,7 @@ defmodule HTTP2ProtocolTest do
 
       assert SimpleH2Client.successful_response?(socket, 1, false)
       {:ok, 1, true, body} = SimpleH2Client.recv_body(socket)
-      assert Jason.decode!(body)["scheme"] == "http"
+      assert Jason.decode!(body)["scheme"] == "https"
     end
 
     test "derives host from host header", context do
@@ -2940,7 +2940,7 @@ defmodule HTTP2ProtocolTest do
       assert Jason.decode!(body)["scheme"] == "https"
     end
 
-    test "uses :scheme even if it does not match transport", context do
+    test "uses transport even if it does not match :scheme", context do
       socket = SimpleH2Client.setup_connection(context)
 
       headers = [
@@ -2954,7 +2954,7 @@ defmodule HTTP2ProtocolTest do
 
       assert SimpleH2Client.successful_response?(socket, 1, false)
       {:ok, 1, true, body} = SimpleH2Client.recv_body(socket)
-      assert Jason.decode!(body)["scheme"] == "http"
+      assert Jason.decode!(body)["scheme"] == "https"
     end
 
     test "derives host from :authority header, even if it differs from host header", context do