diff options
| author | marcin mikołajczak <git@mkljczk.pl> | 2023-12-22 13:29:56 +0100 |
|---|---|---|
| committer | marcin mikołajczak <git@mkljczk.pl> | 2023-12-22 13:29:56 +0100 |
| commit | 28e5e65676ea08ae9e329d51648baf06dcf950c0 (patch) | |
| tree | fd0b04e34a2f3df53b35ed5c3eb8301ad242ede6 /lib/phoenix | |
| parent | 39d3df86c8e2ee05d409865ebc866c543a604ad9 (diff) | |
| parent | 5f1d70736711275ac9f0c95e5ada4cb2f1a96e11 (diff) | |
| download | pleroma-28e5e65676ea08ae9e329d51648baf06dcf950c0.tar.gz pleroma-28e5e65676ea08ae9e329d51648baf06dcf950c0.zip | |
Merge remote-tracking branch 'origin/develop' into webfinger-fix
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 |