diff options
| author | feld <feld@feld.me> | 2020-10-27 17:42:24 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-10-27 17:42:24 +0000 |
| commit | e062329a177e1a1382cb3a44ef71e6d278b4963e (patch) | |
| tree | 1d98291af1a0d0c64794bc2b4e13ee7e62c634bc /lib/phoenix | |
| parent | d16336e7fbf7851ee5f50a17747067f2be741581 (diff) | |
| parent | 2f7401806bbe5427bbcaa7cdce35130320ae3bb4 (diff) | |
| download | pleroma-e062329a177e1a1382cb3a44ef71e6d278b4963e.tar.gz pleroma-e062329a177e1a1382cb3a44ef71e6d278b4963e.zip | |
Merge branch 'develop' into 'feature/autofollowing'
# 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}}} |