Merge branch 'chore/elixir-1.11' into 'develop'
Elixir 1.11 compatibility / Phoenix 1.5+ See merge request pleroma/pleroma!3059
This commit is contained in:
parent
49b43e668e
commit
6c8469664a
33 changed files with 89 additions and 83 deletions
|
|
@ -31,7 +31,12 @@ defmodule Phoenix.Transports.WebSocket.Raw do
|
|||
|
||||
case conn do
|
||||
%{halted: false} = conn ->
|
||||
case Transport.connect(endpoint, handler, transport, __MODULE__, nil, conn.params) do
|
||||
case handler.connect(%{
|
||||
endpoint: endpoint,
|
||||
transport: transport,
|
||||
options: [serializer: nil],
|
||||
params: conn.params
|
||||
}) do
|
||||
{:ok, socket} ->
|
||||
{:ok, conn, {__MODULE__, {socket, opts}}}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue