diff options
| author | feld <feld@feld.me> | 2020-10-22 20:33:52 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-10-22 20:33:52 +0000 |
| commit | d6907e6e0c50e8c965d07dd902ead94ff2d20f12 (patch) | |
| tree | a49bb13a96a0b6f200d35f8df66a37ed8c6ca3f0 /lib/phoenix | |
| parent | d031b185e2c9f143b134b1813a799910adf10bad (diff) | |
| parent | 14900164b8e56d8dc5506016e5a0b55632306e34 (diff) | |
| download | pleroma-d6907e6e0c50e8c965d07dd902ead94ff2d20f12.tar.gz pleroma-d6907e6e0c50e8c965d07dd902ead94ff2d20f12.zip | |
Merge branch 'chore/elixir-1.11' into 'develop'
Elixir 1.11 compatibility / Phoenix 1.5+
See merge request pleroma/pleroma!3059
Diffstat (limited to 'lib/phoenix')
| -rw-r--r-- | lib/phoenix/transports/web_socket/raw.ex | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/phoenix/transports/web_socket/raw.ex b/lib/phoenix/transports/web_socket/raw.ex index aab7fad99..c3665bebe 100644 --- a/lib/phoenix/transports/web_socket/raw.ex +++ b/lib/phoenix/transports/web_socket/raw.ex @@ -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}}} |