From 6c8469664a08d2cd02bd8e6d998d8e2d5f07dac5 Mon Sep 17 00:00:00 2001
From: feld <feld@feld.me>
Date: Thu, 22 Oct 2020 20:33:52 +0000
Subject: Merge branch 'chore/elixir-1.11' into 'develop'

Elixir 1.11 compatibility / Phoenix 1.5+

See merge request pleroma/pleroma!3059
---
 lib/phoenix/transports/web_socket/raw.ex | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'lib/phoenix')

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}}}
 
-- 
cgit v1.2.3