Skip to content
Merged
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
1 change: 0 additions & 1 deletion lib/plug/cowboy.ex
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,6 @@ defmodule Plug.Cowboy do

socket_opts =
socket_opts
|> Keyword.put_new(:next_protocols_advertised, ["h2", "http/1.1"])
|> Keyword.put_new(:alpn_preferred_protocols, ["h2", "http/1.1"])

{:ranch_ssl, :cowboy_tls, %{transport_opts | socket_opts: socket_opts}}
Expand Down
1 change: 0 additions & 1 deletion test/plug/cowboy_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ defmodule Plug.CowboyTest do
] = opts

assert Keyword.get(socket_opts, :alpn_preferred_protocols) == ["h2", "http/1.1"]
assert Keyword.get(socket_opts, :next_protocols_advertised) == ["h2", "http/1.1"]
end

test "builds args for cowboy dispatch" do
Expand Down
Loading