diff options
| author | marcin mikołajczak <git@mkljczk.pl> | 2023-12-22 13:54:44 +0100 |
|---|---|---|
| committer | marcin mikołajczak <git@mkljczk.pl> | 2023-12-22 13:54:44 +0100 |
| commit | 9fc6676d8c080dbd630434275363cc6536a35116 (patch) | |
| tree | 6b628db0cacdd28332a3ce8e3a3e85d5fd070ad2 /lib/phoenix | |
| parent | 6b8c5e12dfe759ac1286e81e72ad7f8727e01386 (diff) | |
| parent | 5f1d70736711275ac9f0c95e5ada4cb2f1a96e11 (diff) | |
| download | pleroma-9fc6676d8c080dbd630434275363cc6536a35116.tar.gz pleroma-9fc6676d8c080dbd630434275363cc6536a35116.zip | |
Merge remote-tracking branch 'origin/develop' into instance-contact-account
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 |