diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-10-28 19:03:40 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-10-28 19:03:40 +0300 |
| commit | ba50dc05a8d655deece0aa619aebe1e25dc9d4eb (patch) | |
| tree | 4fd9c8ccc64de7b7ab1be6dd0659d34a6daa87d9 /lib/phoenix | |
| parent | d54233760f4c006d89aa80e0ae78cb6910fc74ab (diff) | |
| parent | 342c2e1bc0055b71a9772ef031eab3e8bc88d29b (diff) | |
| download | pleroma-ba50dc05a8d655deece0aa619aebe1e25dc9d4eb.tar.gz pleroma-ba50dc05a8d655deece0aa619aebe1e25dc9d4eb.zip | |
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
# Conflicts:
# CHANGELOG.md
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}}} |