diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-12-30 17:10:02 -0600 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-12-30 17:10:02 -0600 |
| commit | cbce88007672dc810cb345bb9872a009cbdc93d8 (patch) | |
| tree | 45be2517812f2a598d9b6133554038a87d4b9f46 /lib/phoenix | |
| parent | 83770b7b391fdf8bdc22f63047b1cf444a7b16ce (diff) | |
| parent | 38924166eb3228deb71a2e23f1e8fd3255c6bd85 (diff) | |
| download | pleroma-cbce88007672dc810cb345bb9872a009cbdc93d8.tar.gz pleroma-cbce88007672dc810cb345bb9872a009cbdc93d8.zip | |
Merge remote-tracking branch 'upstream/develop' into aliases
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}}} |