Commit 40944944 authored by Philipp Hörist's avatar Philipp Hörist

Websocket: Don’t add port to custom url

Fixes #10327
parent 78482964
Pipeline #6689 passed with stages
in 5 minutes and 12 seconds
......@@ -1335,13 +1335,13 @@ def get_custom_host(account):
port = app.settings.get_account_setting(account, 'custom_port')
type_ = app.settings.get_account_setting(account, 'custom_type')
protocol = ConnectionProtocol.TCP
if host.startswith('ws://') or host.startswith('wss://'):
protocol = ConnectionProtocol.WEBSOCKET
else:
host = f'{host}:{port}'
protocol = ConnectionProtocol.TCP
return ('%s:%s' % (host, port),
protocol,
ConnectionType(type_))
return (host, protocol, ConnectionType(type_))
def warn_about_plain_connection(account, connection_types):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment