diff options
| author | lain <lain@soykaf.club> | 2020-11-04 15:05:01 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-11-04 15:05:01 +0100 |
| commit | 329aa19c9f1175f915441c84689860155949bb08 (patch) | |
| tree | 17a92069fdb2f49d2f82efdabf3bec1e20822508 /lib/phoenix | |
| parent | 755f58168bb2b6b979c6f5d36f7eff56d2305911 (diff) | |
| parent | bc4d9c4ffc9ccd826220893a97ce695e4bb66f9d (diff) | |
| download | pleroma-329aa19c9f1175f915441c84689860155949bb08.tar.gz pleroma-329aa19c9f1175f915441c84689860155949bb08.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
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}}} |