diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-11-14 19:48:47 -0600 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-11-14 19:48:47 -0600 |
| commit | 9546c1444c2c8c4abc9bcb35b6a8ff360ddc83af (patch) | |
| tree | cc6b9add45f34878b1ce053b6a408e059768fa6a /lib/phoenix/transports | |
| parent | dc38dc847207e4724265fbeb111d0a236b75f93f (diff) | |
| parent | 28da36975dc325bb577ee81fb791fbdc7ec3e7e2 (diff) | |
| download | pleroma-9546c1444c2c8c4abc9bcb35b6a8ff360ddc83af.tar.gz pleroma-9546c1444c2c8c4abc9bcb35b6a8ff360ddc83af.zip | |
Merge remote-tracking branch 'upstream/develop' into registration-workflow
Diffstat (limited to 'lib/phoenix/transports')
| -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}}} |