diff options
| author | feld <feld@feld.me> | 2020-10-22 20:33:52 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-11-04 17:05:21 +0300 |
| commit | 6c8469664a08d2cd02bd8e6d998d8e2d5f07dac5 (patch) | |
| tree | ed1d6e555e7b06dd93e0c24d6db69df4ef8c8cf6 /lib/phoenix | |
| parent | 49b43e668eb208a95a621f667f72f41b69bc10e5 (diff) | |
| download | pleroma-6c8469664a08d2cd02bd8e6d998d8e2d5f07dac5.tar.gz pleroma-6c8469664a08d2cd02bd8e6d998d8e2d5f07dac5.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}}} |