diff options
| author | minibikini <egor@kislitsyn.com> | 2020-10-27 18:59:19 +0000 |
|---|---|---|
| committer | minibikini <egor@kislitsyn.com> | 2020-10-27 18:59:19 +0000 |
| commit | 1bfd8528bbc71c8c34253eb245de7df498064fb4 (patch) | |
| tree | 97387260c85bb6b5505924de806110d8f71eb3fc /lib/phoenix | |
| parent | 18a91d85e59eb67a2d58a28aae732c34b75ebe97 (diff) | |
| parent | 5aff4799515c141cb0a42686733b2f40faba6f86 (diff) | |
| download | pleroma-1bfd8528bbc71c8c34253eb245de7df498064fb4.tar.gz pleroma-1bfd8528bbc71c8c34253eb245de7df498064fb4.zip | |
Merge branch 'develop' into 'feature/local-only-scope'
# 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}}} |