diff options
| author | lain <lain@soykaf.club> | 2023-11-12 13:34:27 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2023-11-12 13:34:27 +0000 |
| commit | 5f19fbc5a99847e56235e128d36b49bbe76c454d (patch) | |
| tree | 816b81ea6b2e1a4b4a0cd237b354706754963dc2 /lib/phoenix | |
| parent | e902c7168d40e10821e8060542f14168f78805a2 (diff) | |
| parent | ef6d3dddd411f47eeebb378a290f1f9b73a0b5a7 (diff) | |
| download | pleroma-5f19fbc5a99847e56235e128d36b49bbe76c454d.tar.gz pleroma-5f19fbc5a99847e56235e128d36b49bbe76c454d.zip | |
Merge branch 'phoenix1.7' into 'develop'
Update to Phoenix 1.7
See merge request pleroma/pleroma!3900
Diffstat (limited to 'lib/phoenix')
| -rw-r--r-- | lib/phoenix/transports/web_socket/raw.ex | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/phoenix/transports/web_socket/raw.ex b/lib/phoenix/transports/web_socket/raw.ex index 8cf9c32a2..cf4fda79f 100644 --- a/lib/phoenix/transports/web_socket/raw.ex +++ b/lib/phoenix/transports/web_socket/raw.ex @@ -26,7 +26,6 @@ defmodule Phoenix.Transports.WebSocket.Raw do conn |> fetch_query_params |> Transport.transport_log(opts[:transport_log]) - |> Transport.force_ssl(handler, endpoint, opts) |> Transport.check_origin(handler, endpoint, opts) case conn do |