diff options
| author | lain <lain@soykaf.club> | 2020-11-04 15:38:10 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-11-04 15:38:10 +0100 |
| commit | 504a829edb821f24fe7138380e77533cc9f802e6 (patch) | |
| tree | d63c3a26e31ec608274becc2e53d0894151b4fe8 /lib/phoenix | |
| parent | 2ca98f2d94e2976ae35998aecff27809d4b066cf (diff) | |
| parent | bc4d9c4ffc9ccd826220893a97ce695e4bb66f9d (diff) | |
| download | pleroma-504a829edb821f24fe7138380e77533cc9f802e6.tar.gz pleroma-504a829edb821f24fe7138380e77533cc9f802e6.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status
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}}} |