diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2024-01-21 12:03:29 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2024-01-21 12:03:29 +0000 |
| commit | ab3f03a04a34f2e267bef649ea7d055df583e43e (patch) | |
| tree | 41c555d32f0805a45f553ae348b9bf42158e9426 /lib/phoenix/transports/web_socket/raw.ex | |
| parent | a5f64ffd0cba5e183744cf46506656ba61d36eda (diff) | |
| parent | 548434f85ccaa4a77c460fb5bda37153ea6e9c39 (diff) | |
| download | pleroma-ab3f03a04a34f2e267bef649ea7d055df583e43e.tar.gz pleroma-ab3f03a04a34f2e267bef649ea7d055df583e43e.zip | |
Merge branch 'develop' into 'public-polls'
# Conflicts:
# docs/development/API/differences_in_mastoapi_responses.md
Diffstat (limited to 'lib/phoenix/transports/web_socket/raw.ex')
| -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 |