diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-10-29 15:35:42 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-10-29 15:35:42 +0400 |
| commit | fa902867c07212a7d2936a953037c22a40cda51e (patch) | |
| tree | e324c9afc7651ee6f79f6718d7b46b09b1ed20be /lib/phoenix | |
| parent | 76c4e80e5a1b59efeeaf7797d9c08081b7a66c5f (diff) | |
| parent | 0e0a6aef70fc0cac1f9176e4f50a7fe4930242fa (diff) | |
| download | pleroma-fa902867c07212a7d2936a953037c22a40cda51e.tar.gz pleroma-fa902867c07212a7d2936a953037c22a40cda51e.zip | |
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
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}}} |