diff options
| author | marcin mikołajczak <git@mkljczk.pl> | 2024-01-31 22:19:33 +0100 |
|---|---|---|
| committer | marcin mikołajczak <git@mkljczk.pl> | 2024-01-31 22:19:33 +0100 |
| commit | 226e53fdd73e95483efec08d11f6fae217b68f45 (patch) | |
| tree | de3c09b6d5c625d41db8ef6fa54de74f642c2363 /lib/phoenix | |
| parent | 9363ef53a34c9d96191bccaece76dd4e01f493b6 (diff) | |
| parent | 3b9d991514e53ad8f442ffc674dd9b1422fdc415 (diff) | |
| download | pleroma-226e53fdd73e95483efec08d11f6fae217b68f45.tar.gz pleroma-226e53fdd73e95483efec08d11f6fae217b68f45.zip | |
Merge remote-tracking branch 'origin/develop' into status-notification-type
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
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 |