Philipp Hörist pushed to branch master at gajim / gajim
Commits:
40944944 by lovetox at 2020-10-28T21:01:36+01:00
Websocket: Don’t add port to custom url
Fixes #10327
- - - - -
1 changed file:
- gajim/common/helpers.py
Changes:
=====================================
gajim/common/helpers.py
=====================================
@@ -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):
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/40944944feb73c86dc9703dda87a21e4c3eb2ef0
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/40944944feb73c86dc9703dda87a21e4c3eb2ef0
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
