logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 7511f3d192bff285d0ca22c03cd9a46fd552cdde
parent: 6c82b6e3bf42f9897522c0f7ebd101dd01311a46
Author: kaniini <ariadne@dereferenced.org>
Date:   Fri, 18 Oct 2019 04:42:02 +0000

Merge branch 'fix-streaming-with-sec-websocket-protocol' into 'develop'

Fix streaming websocket handshake with `Sec-WebSocket-Protocol`

See merge request pleroma/pleroma!1847

Diffstat:

Mlib/pleroma/web/mastodon_api/websocket_handler.ex7+++++++
1 file changed, 7 insertions(+), 0 deletions(-)

diff --git a/lib/pleroma/web/mastodon_api/websocket_handler.ex b/lib/pleroma/web/mastodon_api/websocket_handler.ex @@ -35,6 +35,13 @@ defmodule Pleroma.Web.MastodonAPI.WebsocketHandler do {_, stream} <- List.keyfind(params, "stream", 0), {:ok, user} <- allow_request(stream, [access_token, sec_websocket]), topic when is_binary(topic) <- expand_topic(stream, params) do + req = + if sec_websocket do + :cowboy_req.set_resp_header("sec-websocket-protocol", sec_websocket, req) + else + req + end + {:cowboy_websocket, req, %{user: user, topic: topic}, %{idle_timeout: @timeout}} else {:error, code} ->