summaryrefslogtreecommitdiff
path: root/lib/phoenix
diff options
context:
space:
mode:
authormarcin mikołajczak <git@mkljczk.pl>2023-12-22 14:34:30 +0100
committermarcin mikołajczak <git@mkljczk.pl>2023-12-22 14:34:30 +0100
commit6051715a990b7eb4379daec46d5ea0d63dce2c09 (patch)
treee53a6e689839a188e1dd8770e19135fb28bf8a0b /lib/phoenix
parent5846e7d5f6b91ab63270f2104543d874589d39ca (diff)
parent5f1d70736711275ac9f0c95e5ada4cb2f1a96e11 (diff)
downloadpleroma-6051715a990b7eb4379daec46d5ea0d63dce2c09.tar.gz
pleroma-6051715a990b7eb4379daec46d5ea0d63dce2c09.zip
Merge remote-tracking branch 'origin/develop' into instance_rules
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
Diffstat (limited to 'lib/phoenix')
-rw-r--r--lib/phoenix/transports/web_socket/raw.ex1
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