diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-10-27 12:51:31 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-10-27 12:51:31 -0500 |
| commit | 9e54ef086b45c9df38eb293e4db2ea653261c83b (patch) | |
| tree | 4510ec649a6db5116b4a50c0fe9363592938a45b /lib/phoenix | |
| parent | 034ac43f3a91178694d3c621c52ce68207ec4f69 (diff) | |
| parent | 2f7401806bbe5427bbcaa7cdce35130320ae3bb4 (diff) | |
| download | pleroma-9e54ef086b45c9df38eb293e4db2ea653261c83b.tar.gz pleroma-9e54ef086b45c9df38eb293e4db2ea653261c83b.zip | |
Merge branch 'develop' into feature/account-export
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}}} |