diff options
| author | lain <lain@soykaf.club> | 2020-10-26 17:50:34 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-10-26 17:50:34 +0100 |
| commit | 04b7505c75afbaa1f785b2adaf0313e9b0935fab (patch) | |
| tree | da42147dc907cb7ffcc576b81b16c6c6ed0ef9ad /lib/phoenix | |
| parent | b3d6cf90229ff3e9a5bd0028d4a6cbd3b68da9fe (diff) | |
| parent | 2f7401806bbe5427bbcaa7cdce35130320ae3bb4 (diff) | |
| download | pleroma-04b7505c75afbaa1f785b2adaf0313e9b0935fab.tar.gz pleroma-04b7505c75afbaa1f785b2adaf0313e9b0935fab.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior
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}}} |